libxslt: make python3 an input

authored by Ivan Babrou and committed by Frederik Rietdijk b2ce768e 86de9261

+6 -8
+4 -4
pkgs/development/libraries/libxslt/default.nix
··· 1 - { lib, stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, gettext, python, libgcrypt 1 + { lib, stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, gettext, python3, libgcrypt 2 2 , cryptoSupport ? false 3 3 , pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform 4 4 }: ··· 16 16 17 17 buildInputs = [ libxml2.dev ] 18 18 ++ lib.optional stdenv.isDarwin gettext 19 - ++ lib.optionals pythonSupport [ libxml2.py python ] 19 + ++ lib.optionals pythonSupport [ libxml2.py python3 ] 20 20 ++ lib.optionals cryptoSupport [ libgcrypt ]; 21 21 22 22 propagatedBuildInputs = [ findXMLCatalogs ]; ··· 26 26 "--without-debug" 27 27 "--without-mem-debug" 28 28 "--without-debugger" 29 - ] ++ lib.optional pythonSupport "--with-python=${python}" 29 + ] ++ lib.optional pythonSupport "--with-python=${python3}" 30 30 ++ lib.optional (!cryptoSupport) "--without-crypto"; 31 31 32 32 postFixup = '' ··· 36 36 '' + lib.optionalString pythonSupport '' 37 37 mkdir -p $py/nix-support 38 38 echo ${libxml2.py} >> $py/nix-support/propagated-build-inputs 39 - moveToOutput ${python.libPrefix} "$py" 39 + moveToOutput ${python3.libPrefix} "$py" 40 40 ''; 41 41 42 42 passthru = {
+1 -3
pkgs/top-level/all-packages.nix
··· 15565 15565 15566 15566 libxmp = callPackage ../development/libraries/libxmp { }; 15567 15567 15568 - libxslt = callPackage ../development/libraries/libxslt { 15569 - python = python3; 15570 - }; 15568 + libxslt = callPackage ../development/libraries/libxslt { }; 15571 15569 15572 15570 libxsmm = callPackage ../development/libraries/libxsmm { }; 15573 15571
+1 -1
pkgs/top-level/python-packages.nix
··· 3716 3716 3717 3717 libxslt = (toPythonModule (pkgs.libxslt.override { 3718 3718 pythonSupport = true; 3719 - inherit python; 3719 + python3 = python; 3720 3720 inherit (self) libxml2; 3721 3721 })).py; 3722 3722