summary refs log tree commit diff
path: root/pkgs/development/libraries/libmodulemd
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2020-04-07 19:14:55 +0200
committerJan Tojnar <jtojnar@gmail.com>2020-04-08 12:32:39 +0200
commitaf476597c0b14389b7551b8ebb5fdce216682063 (patch)
tree1058d56e7753a15054d9379505773b2a858500fb /pkgs/development/libraries/libmodulemd
parent2eab203e57d31e17df563cc78d7f8819503d47fd (diff)
downloadnixpkgs-af476597c0b14389b7551b8ebb5fdce216682063.tar
nixpkgs-af476597c0b14389b7551b8ebb5fdce216682063.tar.gz
nixpkgs-af476597c0b14389b7551b8ebb5fdce216682063.tar.bz2
nixpkgs-af476597c0b14389b7551b8ebb5fdce216682063.tar.lz
nixpkgs-af476597c0b14389b7551b8ebb5fdce216682063.tar.xz
nixpkgs-af476597c0b14389b7551b8ebb5fdce216682063.tar.zst
nixpkgs-af476597c0b14389b7551b8ebb5fdce216682063.zip
python3.pkgs.libmodulemd: init bindings
Diffstat (limited to 'pkgs/development/libraries/libmodulemd')
-rw-r--r--pkgs/development/libraries/libmodulemd/default.nix18
1 files changed, 14 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libmodulemd/default.nix b/pkgs/development/libraries/libmodulemd/default.nix
index 37753b92c62..f296883b686 100644
--- a/pkgs/development/libraries/libmodulemd/default.nix
+++ b/pkgs/development/libraries/libmodulemd/default.nix
@@ -38,10 +38,14 @@ stdenv.mkDerivation rec {
     })
 
     # Install pygobject overrides to our prefix instead of python3 one.
-    # https://github.com/fedora-modularity/libmodulemd/pull/467
+    # https://github.com/fedora-modularity/libmodulemd/pull/469
     (fetchpatch {
-      url = "https://github.com/fedora-modularity/libmodulemd/commit/516cb64fd1488716a188add2715c8b3296960bd6.patch";
-      sha256 = "ZWagkqKkD9CIkcYsKLtC0+qjLp80wH3taivUCn8jQbY=";
+      url = "https://github.com/fedora-modularity/libmodulemd/commit/f72a4bea092f4d84cfc48a3e820eb10270e828d0.patch";
+      sha256 = "7/76N9ZQ7qv/DjsaMCL+YWPDzarH1JWW4Sg5HzBJLuc=";
+    })
+    (fetchpatch {
+      url = "https://github.com/fedora-modularity/libmodulemd/commit/021ab08006b5cf601ce153174fdf403b910b8273.patch";
+      sha256 = "JibEmxMiTmu3ShhWLIWfMCtu3c30UcHqXmX9b+2VZXw=";
     })
   ];
 
@@ -65,9 +69,15 @@ stdenv.mkDerivation rec {
 
   mesonFlags = [
     "-Ddeveloper_build=false"
-    "-Dpygobject_override_dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides"
+    "-Dgobject_overrides_dir_py3=${placeholder "py"}/${python3.sitePackages}/gi/overrides"
   ];
 
+  postFixup = ''
+    # Python overrides depend our own typelibs and other packages
+    mkdir -p "$py/nix-support"
+    echo "$out ${python3.pkgs.pygobject3} ${python3.pkgs.six}" > "$py/nix-support/propagated-build-inputs"
+  '';
+
   meta = with stdenv.lib; {
     description = "C Library for manipulating module metadata files";
     homepage = "https://github.com/fedora-modularity/libmodulemd";