diff options
author | Shea Levy <shea@shealevy.com> | 2018-07-14 08:38:39 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2018-07-14 08:38:39 -0400 |
commit | af315bb6c82200dcc0a7cf4111126c1c3fd67b7e (patch) | |
tree | 674729786103e1f8cec101994fd70fbcc9c566d7 /pkgs/development/libraries/ncurses/default.nix | |
parent | 3e31d23d994b94b9883a39037e328c026491b999 (diff) |
ncurses: Fix static build.
Diffstat (limited to 'pkgs/development/libraries/ncurses/default.nix')
-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 cf478837b86d4..cbe977a01926d 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"; @@ -109,6 +108,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 @@ -127,7 +131,7 @@ stdenv.mkDerivation rec { moveToOutput "bin/infotocap" "$out" ''; - preFixup = lib.optionalString (!hostPlatform.isCygwin) '' + preFixup = lib.optionalString (!hostPlatform.isCygwin && !enableStatic) '' rm "$out"/lib/*.a ''; |