ncurses: Fix static build.
This commit is contained in:
parent
3e31d23d99
commit
af315bb6c8
@ -32,7 +32,6 @@ stdenv.mkDerivation rec {
|
|||||||
"--enable-pc-files"
|
"--enable-pc-files"
|
||||||
"--enable-symlinks"
|
"--enable-symlinks"
|
||||||
] ++ lib.optional unicode "--enable-widec"
|
] ++ lib.optional unicode "--enable-widec"
|
||||||
++ lib.optional enableStatic "--enable-static"
|
|
||||||
++ lib.optional (!withCxx) "--without-cxx"
|
++ lib.optional (!withCxx) "--without-cxx"
|
||||||
++ lib.optional (abiVersion == "5") "--with-abi-version=5";
|
++ lib.optional (abiVersion == "5") "--with-abi-version=5";
|
||||||
|
|
||||||
@ -109,6 +108,11 @@ stdenv.mkDerivation rec {
|
|||||||
for statictype in a dll.a la; do
|
for statictype in a dll.a la; do
|
||||||
if [ -e "$out/lib/lib''${library}$suffix.$statictype" ]; then
|
if [ -e "$out/lib/lib''${library}$suffix.$statictype" ]; then
|
||||||
ln -svf lib''${library}$suffix.$statictype $out/lib/lib$library$newsuffix.$statictype
|
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
|
fi
|
||||||
done
|
done
|
||||||
ln -svf ''${library}$suffix.pc $dev/lib/pkgconfig/$library$newsuffix.pc
|
ln -svf ''${library}$suffix.pc $dev/lib/pkgconfig/$library$newsuffix.pc
|
||||||
@ -127,7 +131,7 @@ stdenv.mkDerivation rec {
|
|||||||
moveToOutput "bin/infotocap" "$out"
|
moveToOutput "bin/infotocap" "$out"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
preFixup = lib.optionalString (!hostPlatform.isCygwin) ''
|
preFixup = lib.optionalString (!hostPlatform.isCygwin && !enableStatic) ''
|
||||||
rm "$out"/lib/*.a
|
rm "$out"/lib/*.a
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user