diff options
| author | Robin Gloster <mail@glob.in> | 2019-08-19 16:28:28 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-30 11:13:38 +0100 |
| commit | 74c2020e8c4f9e8ccfd1138ccbcb041ef52cfd6c (patch) | |
| tree | 01471f77a35667c4d37e2f6954c0f2aefda92f83 /pkgs | |
| parent | 3b50d0462a4174bb155b258a32ab1ab4176ba2fc (diff) | |
| download | nixlib-74c2020e8c4f9e8ccfd1138ccbcb041ef52cfd6c.tar nixlib-74c2020e8c4f9e8ccfd1138ccbcb041ef52cfd6c.tar.gz nixlib-74c2020e8c4f9e8ccfd1138ccbcb041ef52cfd6c.tar.bz2 nixlib-74c2020e8c4f9e8ccfd1138ccbcb041ef52cfd6c.tar.lz nixlib-74c2020e8c4f9e8ccfd1138ccbcb041ef52cfd6c.tar.xz nixlib-74c2020e8c4f9e8ccfd1138ccbcb041ef52cfd6c.tar.zst nixlib-74c2020e8c4f9e8ccfd1138ccbcb041ef52cfd6c.zip | |
libxml2: fix further structuredAttrs issues
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/libxml2/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index f5dcb3357f7c..57a7294c887d 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" "doc" ] ++ lib.optional pythonSupport "py" ++ lib.optional (enableStatic && enableShared) "static"; - propagatedBuildOutputs = "out bin" + lib.optionalString pythonSupport " py"; + propagatedBuildOutputs = [ "out" "bin" ] ++ lib.optional pythonSupport "py"; buildInputs = lib.optional pythonSupport python ++ lib.optional (pythonSupport && python?isPy3 && python.isPy3) ncurses @@ -64,8 +64,8 @@ stdenv.mkDerivation rec { preInstall = lib.optionalString pythonSupport ''substituteInPlace python/libxml2mod.la --replace "${python}" "$py"''; - installFlags = lib.optionalString pythonSupport - ''pythondir="$(py)/lib/${python.libPrefix}/site-packages"''; + installFlags = lib.optional pythonSupport + "pythondir=\"${placeholder ''py''}/lib/${python.libPrefix}/site-packages\""; postFixup = '' moveToOutput bin/xml2-config "$dev" |