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

fix ncurses pkgconfig path a final time

Browse Source
This commit is contained in:
Jude Taylor 2015-06-21 00:57:17 -07:00
parent 26da697f73
commit d28e5f1c61
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,10 @@ stdenv.mkDerivation rec {
buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm; buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm;
preConfigure = lib.optionalString stdenv.isCygwin '' preConfigure = ''
export PKG_CONFIG_LIBDIR="$out/lib/pkgconfig"
mkdir -p "$PKG_CONFIG_LIBDIR"
'' + lib.optionalString stdenv.isCygwin ''
sed -i -e 's,LIB_SUFFIX="t,LIB_SUFFIX=",' configure sed -i -e 's,LIB_SUFFIX="t,LIB_SUFFIX=",' configure
''; '';
@ -40,11 +43,6 @@ stdenv.mkDerivation rec {
doCheck = false; doCheck = false;
# The install expects the pkgconfig directory to exist in 5.9
preInstall = ''
mkdir -p "$out/lib/pkgconfig"
'';
# When building a wide-character (Unicode) build, create backward # When building a wide-character (Unicode) build, create backward
# compatibility links from the the "normal" libraries to the # compatibility links from the the "normal" libraries to the
# wide-character libraries (e.g. libncurses.so to libncursesw.so). # wide-character libraries (e.g. libncurses.so to libncursesw.so).