From 3d59a8e1a8341d09689d4ace8765ae134c264fe7 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 21 Oct 2015 02:25:42 +0300 Subject: ncurses: Fix multiple-output flags The old way resuts in literal '$(lib)' etc. in the pkg-config files. --- pkgs/development/libraries/ncurses/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 8de0fd44d30..74b2156efd6 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -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 ''; -- cgit 1.4.1