Merge pull request #51183 from matthewbauer/make-derivation-no-assertions

Fix breaking changes to make-derivation
2018-11-29 19:35:55 -06:00
parent fe6a9a37b9 a56fe056ec
commit e6834171b9
6 changed files with 13 additions and 19 deletions
--- a/pkgs/development/python-modules/py3exiv2/default.nix
+++ b/pkgs/development/python-modules/py3exiv2/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
  patches = [
    (substituteAll {
      src = ./setup.patch;
-      version_ = "3${stdenv.lib.versions.minor python.version}";
+      version = "3${stdenv.lib.versions.minor python.version}";
    })
  ];

--- a/pkgs/development/python-modules/py3exiv2/setup.patch
+++ b/pkgs/development/python-modules/py3exiv2/setup.patch
@@ -3,9 +3,9 @@
@@ -39,7 +39,7 @@
                 if '3' in l[2:]:
                     return l.replace('libboost', 'boost')
-
+ 
 -libboost = get_libboost_name()
-+libboost = 'boost_python@version_@'
-
+libboost = 'boost_python@version@'
+ 
 setup(
     name='py3exiv2',