public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libxml2: fix further structuredAttrs issues

Browse Source
This commit is contained in:
Robin Gloster 2019-08-19 16:28:28 +02:00 committed by Jan Tojnar
parent 3b50d0462a
commit 74c2020e8c
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/libxml2/default.nix
View File

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "dev" "out" "man" "doc" ] outputs = [ "bin" "dev" "out" "man" "doc" ]
++ lib.optional pythonSupport "py" ++ lib.optional pythonSupport "py"
++ lib.optional (enableStatic && enableShared) "static"; ++ lib.optional (enableStatic && enableShared) "static";
propagatedBuildOutputs = "out bin" + lib.optionalString pythonSupport " py"; propagatedBuildOutputs = [ "out" "bin" ] ++ lib.optional pythonSupport "py";
buildInputs = lib.optional pythonSupport python buildInputs = lib.optional pythonSupport python
++ lib.optional (pythonSupport && python?isPy3 && python.isPy3) ncurses ++ lib.optional (pythonSupport && python?isPy3 && python.isPy3) ncurses
@ -64,8 +64,8 @@ stdenv.mkDerivation rec {
preInstall = lib.optionalString pythonSupport preInstall = lib.optionalString pythonSupport
''substituteInPlace python/libxml2mod.la --replace "${python}" "$py"''; ''substituteInPlace python/libxml2mod.la --replace "${python}" "$py"'';
installFlags = lib.optionalString pythonSupport installFlags = lib.optional pythonSupport
''pythondir="$(py)/lib/${python.libPrefix}/site-packages"''; "pythondir=\"${placeholder ''py''}/lib/${python.libPrefix}/site-packages\"";
postFixup = '' postFixup = ''
moveToOutput bin/xml2-config "$dev" moveToOutput bin/xml2-config "$dev"