diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2015-10-21 02:25:42 +0300 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-28 10:23:04 +0100 |
| commit | 3d59a8e1a8341d09689d4ace8765ae134c264fe7 (patch) | |
| tree | 07ec5aa09188919d42d38092bf456ff4f542500a /pkgs | |
| parent | 31e1034800bff9f69d09d62a478252f314415f7d (diff) | |
| download | nixpkgs-3d59a8e1a8341d09689d4ace8765ae134c264fe7.tar nixpkgs-3d59a8e1a8341d09689d4ace8765ae134c264fe7.tar.gz nixpkgs-3d59a8e1a8341d09689d4ace8765ae134c264fe7.tar.bz2 nixpkgs-3d59a8e1a8341d09689d4ace8765ae134c264fe7.tar.lz nixpkgs-3d59a8e1a8341d09689d4ace8765ae134c264fe7.tar.xz nixpkgs-3d59a8e1a8341d09689d4ace8765ae134c264fe7.tar.zst nixpkgs-3d59a8e1a8341d09689d4ace8765ae134c264fe7.zip | |
ncurses: Fix multiple-output flags
The old way resuts in literal '$(lib)' etc. in the pkg-config files.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/ncurses/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
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 ''; |