diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-22 11:04:28 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-22 11:04:28 +0200 |
| commit | 6c72782d364149c7cfea1ea69fdbc1133acc80b5 (patch) | |
| tree | ffb22d1fb7e0f1432c0f4e4063759d61a8bf6e0c /pkgs/development/libraries/ncurses | |
| parent | b21994d4ac9c2c8d372bf011668401ee31972c0b (diff) | |
| parent | 452017032ac8af0c5e09d5abbf7a562ae524fea7 (diff) | |
Merge staging-next into master
Diffstat (limited to 'pkgs/development/libraries/ncurses')
| -rw-r--r-- | pkgs/development/libraries/ncurses/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 042c09fd8644..0cb69f937564 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { "--enable-pc-files" "--enable-symlinks" ] ++ lib.optional unicode "--enable-widec" - ++ lib.optional enableStatic "--enable-static" ++ lib.optional (!withCxx) "--without-cxx" ++ lib.optional (abiVersion == "5") "--with-abi-version=5" ++ lib.optionals hostPlatform.isWindows [ @@ -113,6 +112,11 @@ stdenv.mkDerivation rec { for statictype in a dll.a la; do if [ -e "$out/lib/lib''${library}$suffix.$statictype" ]; then ln -svf lib''${library}$suffix.$statictype $out/lib/lib$library$newsuffix.$statictype + if [ "ncurses" = "$library" ] + then + # make libtinfo symlinks + ln -svf lib''${library}$suffix.$statictype $out/lib/libtinfo$newsuffix.$statictype + fi fi done ln -svf ''${library}$suffix.pc $dev/lib/pkgconfig/$library$newsuffix.pc @@ -131,7 +135,7 @@ stdenv.mkDerivation rec { moveToOutput "bin/infotocap" "$out" ''; - preFixup = lib.optionalString (!hostPlatform.isCygwin) '' + preFixup = lib.optionalString (!hostPlatform.isCygwin && !enableStatic) '' rm "$out"/lib/*.a ''; |