MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 15:56:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

gr-framework: 0.73.5 -> 0.73.6

Browse source
This commit is contained in:
Pavel Sobolev 2024-06-19 21:25:09 +03:00
parent 7d6f59689b
commit 53e4a8e1ab
No known key found for this signature in database
3 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/by-name/gr/gr-framework/package.nix
View file

@ -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

25
pkgs/by-name/gr/gr-framework/patches/use-the-module-mode-to-search-for-the-LibXml2-package.patch
View file

@ -1,25 +0,0 @@
From 78a86da95c7227cbfd0f3073841df5409a576837 Mon Sep 17 00:00:00 2001
From: Pavel Sobolev <paveloomm@gmail.com>
Date: Wed, 31 Jan 2024 16:50:36 +0000
Subject: [PATCH] Use the module mode to search for the `LibXml2` package.
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f865a5b..5550b493 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)
+ find_package(LibXml2 MODULE)
endif()
# Find the following packages only in 3rdparty, if `GR_USE_BUNDLED_LIBRARIES` is set
--
2.42.0

25
pkgs/by-name/gr/gr-framework/use-the-module-mode-to-search-for-the-LibXml2-package.patch Normal file
View file

@ -0,0 +1,25 @@
From 47063bf00060dd6e8ccb384770a7c04dc534dce0 Mon Sep 17 00:00:00 2001
From: Pavel Sobolev <paveloomm@gmail.com>
Date: Wed, 19 Jun 2024 21:17:33 +0300
Subject: [PATCH] Use the module mode to search for the `LibXml2` package.
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed36d99d..6031dc77 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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.45.1