diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2022-02-20 16:32:14 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2022-02-21 14:55:24 +0100 |
| commit | 65ca2a4bbbaea67c734e225432b5464af697726c (patch) | |
| tree | 13750cf3e0a6cab78ae6e1c0f52a5df5f02beea9 /pkgs/development/libraries/libxml2 | |
| parent | 9c57fa9fc1de613bcc03ac1676ae1792942a0f9b (diff) | |
libxml2: More cleanups
Diffstat (limited to 'pkgs/development/libraries/libxml2')
| -rw-r--r-- | pkgs/development/libraries/libxml2/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 64c10d0a7f5bf..cb9a6da864f06 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -14,7 +14,7 @@ , libiconv , pythonSupport ? enableShared && stdenv.buildPlatform == stdenv.hostPlatform , icuSupport ? false -, icu ? null +, icu , enableShared ? stdenv.hostPlatform.libc != "msvcrt" && !stdenv.hostPlatform.isStatic , enableStatic ? !enableShared , gnome @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { ]; installFlags = lib.optionals pythonSupport [ - "pythondir=\"${placeholder "py"}/lib/${python.libPrefix}/site-packages\"" + "pythondir=\"${placeholder "py"}/${python.sitePackages}\"" ]; enableParallelBuilding = true; @@ -109,8 +109,9 @@ stdenv.mkDerivation rec { MACOSX_DEPLOYMENT_TARGET=10.16 ''; - preInstall = lib.optionalString pythonSupport - ''substituteInPlace python/libxml2mod.la --replace "${python}" "$py"''; + preInstall = lib.optionalString pythonSupport '' + substituteInPlace python/libxml2mod.la --replace "${python}" "$py" + ''; postFixup = '' moveToOutput bin/xml2-config "$dev" |