nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-23 17:12:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

dnf-plugins-core: 4.9.0 -> 4.10.0 (#355641)

Browse Source
This commit is contained in:
Paul Meyer
2024-11-14 09:02:11 +01:00
committed by GitHub
parent 45c94f97cc 8d24c9c043
commit e35a60eec5
2 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/python-modules/dnf-plugins-core/default.nix
View File

@@ -23,7 +23,7 @@ in
buildPythonPackage rec {
pname = "dnf-plugins-core";
version = "4.9.0";
version = "4.10.0";
format = "other";
outputs = [
@@ -35,18 +35,15 @@ buildPythonPackage rec {
owner = "rpm-software-management";
repo = "dnf-plugins-core";
rev = "refs/tags/${version}";
hash = "sha256-MQ7QZ5qn/0OU0slohwEP83w8NvSP2M+hpCDKvYqlezY=";
hash = "sha256-7MPCLnclRT07m6CrGguDxSB+sIybp4tMcExU9+Sz9EM=";
};
patches = [ ./fix-python-install-dir.patch ];
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace "@PYTHON_INSTALL_DIR@" "$out/${python.sitePackages}" \
--replace "SYSCONFDIR /etc" "SYSCONFDIR $out/etc" \
--replace "SYSTEMD_DIR /usr/lib/systemd/system" "SYSTEMD_DIR $out/lib/systemd/system"
--replace-fail "SYSCONFDIR /etc" "SYSCONFDIR $out/etc" \
--replace-fail "SYSTEMD_DIR /usr/lib/systemd/system" "SYSTEMD_DIR $out/lib/systemd/system"
substituteInPlace doc/CMakeLists.txt \
--replace 'SPHINX_BUILD_NAME "sphinx-build-3"' 'SPHINX_BUILD_NAME "${sphinx}/bin/sphinx-build"'
--replace-fail 'SPHINX_BUILD_NAME "sphinx-build-3"' 'SPHINX_BUILD_NAME "${sphinx}/bin/sphinx-build"'
'';
nativeBuildInputs = [
@@ -68,6 +65,7 @@ buildPythonPackage rec {
cmakeFlags = [
"-DPYTHON_DESIRED=${pyMajor}"
"-DWITHOUT_LOCAL=0"
"-DPYTHON_INSTALL_DIR=${placeholder "out"}/${python.sitePackages}"
];
postBuild = ''

13
pkgs/development/python-modules/dnf-plugins-core/fix-python-install-dir.patch
View File

@@ -1,13 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a1eea7b..00fbaf3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ ELSE ()
MESSAGE (FATAL_ERROR "Invalid PYTHON_DESIRED value: " ${PYTHON_DESIRED})
ENDIF()
-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from sysconfig import get_path; stdout.write(get_path('purelib'))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
+SET(PYTHON_INSTALL_DIR "@PYTHON_INSTALL_DIR@")
MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}")
SET (SYSCONFDIR /etc)