ncurses: Fix multiple-output flags
The old way resuts in literal '$(lib)' etc. in the pkg-config files.
This commit is contained in:
parent
31e1034800
commit
3d59a8e1a8
@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
|
||||
"--enable-overwrite" # Needed for proper header installation
|
||||
"--enable-pc-files"
|
||||
"--enable-symlinks"
|
||||
"--libdir=$(lib)/lib" "--includedir=$(dev)/include" "--bindir=$(dev)/bin" "--mandir=$(man)/share/man"
|
||||
] ++ lib.optional unicode "--enable-widec";
|
||||
|
||||
nativeBuildInputs = [ pkgconfig libtool ];
|
||||
@ -36,7 +35,13 @@ stdenv.mkDerivation rec {
|
||||
preConfigure = ''
|
||||
export PKG_CONFIG_LIBDIR="$dev/lib/pkgconfig"
|
||||
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 ''
|
||||
sed -i -e 's,LIB_SUFFIX="t,LIB_SUFFIX=",' configure
|
||||
'';
|
||||
|
Loading…
Reference in New Issue
Block a user