public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ncurses: Fix multiple-output flags 

The old way resuts in literal '$(lib)' etc. in the pkg-config files.
This commit is contained in:
Tuomas Tynkkynen 2015-10-21 02:25:42 +03:00 committed by Vladimír Čunát
parent 31e1034800
commit 3d59a8e1a8
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/ncurses/default.nix
View File

@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
"--enable-overwrite" # Needed for proper header installation "--enable-overwrite" # Needed for proper header installation
"--enable-pc-files" "--enable-pc-files"
"--enable-symlinks" "--enable-symlinks"
"--libdir=$(lib)/lib" "--includedir=$(dev)/include" "--bindir=$(dev)/bin" "--mandir=$(man)/share/man"
] ++ lib.optional unicode "--enable-widec"; ] ++ lib.optional unicode "--enable-widec";
nativeBuildInputs = [ pkgconfig libtool ]; nativeBuildInputs = [ pkgconfig libtool ];
@ -36,7 +35,13 @@ stdenv.mkDerivation rec {
preConfigure = '' preConfigure = ''
export PKG_CONFIG_LIBDIR="$dev/lib/pkgconfig" export PKG_CONFIG_LIBDIR="$dev/lib/pkgconfig"
mkdir -p "$PKG_CONFIG_LIBDIR" mkdir -p "$PKG_CONFIG_LIBDIR"
configureFlagsArray+=("--with-pkg-config-libdir=$PKG_CONFIG_LIBDIR") configureFlagsArray+=(
"--libdir=$lib/lib"
"--includedir=$dev/include"
"--bindir=$dev/bin"
"--mandir=$man/share/man"
"--with-pkg-config-libdir=$PKG_CONFIG_LIBDIR"
)
'' + lib.optionalString stdenv.isCygwin '' '' + lib.optionalString stdenv.isCygwin ''
sed -i -e 's,LIB_SUFFIX="t,LIB_SUFFIX=",' configure sed -i -e 's,LIB_SUFFIX="t,LIB_SUFFIX=",' configure
''; '';