Loading pkgs/by-name/gr/gr-framework/package.nix +3 −3 Original line number Diff line number Diff line Loading @@ -21,16 +21,16 @@ stdenv.mkDerivation rec { pname = "gr-framework"; version = "0.73.5"; version = "0.73.6"; src = fetchFromGitHub { owner = "sciapp"; repo = "gr"; rev = "v${version}"; hash = "sha256-9Py2r774GaUXWhF3yO3ceT1rPi/uqMVZVAo0xs9n+I0="; hash = "sha256-XzOII13XwxkPZhtL4USkmUmJTL7dZImx4yVYJmhcn08="; }; patches = [ ./patches/use-the-module-mode-to-search-for-the-LibXml2-package.patch ]; patches = [ ./use-the-module-mode-to-search-for-the-LibXml2-package.patch ]; nativeBuildInputs = [ cmake Loading pkgs/by-name/gr/gr-framework/patches/use-the-module-mode-to-search-for-the-LibXml2-package.patch→pkgs/by-name/gr/gr-framework/use-the-module-mode-to-search-for-the-LibXml2-package.patch +25 −0 Original line number Diff line number Diff line From 78a86da95c7227cbfd0f3073841df5409a576837 Mon Sep 17 00:00:00 2001 From 47063bf00060dd6e8ccb384770a7c04dc534dce0 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev <paveloomm@gmail.com> Date: Wed, 31 Jan 2024 16:50:36 +0000 Date: Wed, 19 Jun 2024 21:17:33 +0300 Subject: [PATCH] Use the module mode to search for the `LibXml2` package. --- Loading @@ -8,18 +8,18 @@ Subject: [PATCH] Use the module mode to search for the `LibXml2` package. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f865a5b..5550b493 100644 index ed36d99d..6031dc77 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -117,7 +117,7 @@ if(GR_USE_BUNDLED_LIBRARIES) # (`ONLY_CMAKE_FIND_ROOT_PATH` option is not inherited to `find_package` calls within the LibXml2 config file) find_package(LibXml2 NO_MODULE ONLY_CMAKE_FIND_ROOT_PATH) else() - find_package(LibXml2 NO_MODULE) @@ -123,7 +123,7 @@ else() # Therefore, disable the inspection of the `PATH` variable by setting `NO_SYSTEM_ENVIRONMENT_PATH` option. # See <https://cmake.org/cmake/help/v3.30/command/find_package.html#:~:text=Search the standard system environment # variables> for more details. - find_package(LibXml2 NO_MODULE NO_SYSTEM_ENVIRONMENT_PATH) + find_package(LibXml2 MODULE) endif() # Find the following packages only in 3rdparty, if `GR_USE_BUNDLED_LIBRARIES` is set -- 2.42.0 2.45.1 Loading
pkgs/by-name/gr/gr-framework/package.nix +3 −3 Original line number Diff line number Diff line Loading @@ -21,16 +21,16 @@ stdenv.mkDerivation rec { pname = "gr-framework"; version = "0.73.5"; version = "0.73.6"; src = fetchFromGitHub { owner = "sciapp"; repo = "gr"; rev = "v${version}"; hash = "sha256-9Py2r774GaUXWhF3yO3ceT1rPi/uqMVZVAo0xs9n+I0="; hash = "sha256-XzOII13XwxkPZhtL4USkmUmJTL7dZImx4yVYJmhcn08="; }; patches = [ ./patches/use-the-module-mode-to-search-for-the-LibXml2-package.patch ]; patches = [ ./use-the-module-mode-to-search-for-the-LibXml2-package.patch ]; nativeBuildInputs = [ cmake Loading
pkgs/by-name/gr/gr-framework/patches/use-the-module-mode-to-search-for-the-LibXml2-package.patch→pkgs/by-name/gr/gr-framework/use-the-module-mode-to-search-for-the-LibXml2-package.patch +25 −0 Original line number Diff line number Diff line From 78a86da95c7227cbfd0f3073841df5409a576837 Mon Sep 17 00:00:00 2001 From 47063bf00060dd6e8ccb384770a7c04dc534dce0 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev <paveloomm@gmail.com> Date: Wed, 31 Jan 2024 16:50:36 +0000 Date: Wed, 19 Jun 2024 21:17:33 +0300 Subject: [PATCH] Use the module mode to search for the `LibXml2` package. --- Loading @@ -8,18 +8,18 @@ Subject: [PATCH] Use the module mode to search for the `LibXml2` package. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f865a5b..5550b493 100644 index ed36d99d..6031dc77 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -117,7 +117,7 @@ if(GR_USE_BUNDLED_LIBRARIES) # (`ONLY_CMAKE_FIND_ROOT_PATH` option is not inherited to `find_package` calls within the LibXml2 config file) find_package(LibXml2 NO_MODULE ONLY_CMAKE_FIND_ROOT_PATH) else() - find_package(LibXml2 NO_MODULE) @@ -123,7 +123,7 @@ else() # Therefore, disable the inspection of the `PATH` variable by setting `NO_SYSTEM_ENVIRONMENT_PATH` option. # See <https://cmake.org/cmake/help/v3.30/command/find_package.html#:~:text=Search the standard system environment # variables> for more details. - find_package(LibXml2 NO_MODULE NO_SYSTEM_ENVIRONMENT_PATH) + find_package(LibXml2 MODULE) endif() # Find the following packages only in 3rdparty, if `GR_USE_BUNDLED_LIBRARIES` is set -- 2.42.0 2.45.1