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

ncurses: Cleanup some old hacks

Browse Source
This commit is contained in:
William A. Kennington III 2015-06-20 13:59:11 -07:00
parent d4f176f70d
commit c49301b2f7
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,23 +20,17 @@ stdenv.mkDerivation rec {
# gcc-5.patch should be removed after 5.9 # gcc-5.patch should be removed after 5.9
patches = [ ./clang.patch ./gcc-5.patch ]; patches = [ ./clang.patch ./gcc-5.patch ];
configureFlags = configureFlags = [
[ "--with-shared" "--without-debug" "--enable-pc-files" "--enable-symlinks" ] "--with-shared"
++ lib.optional unicode "--enable-widec"; "--without-debug"
"--enable-pc-files"
"--enable-symlinks"
"--includedir=\${out}/include"
] ++ lib.optional unicode "--enable-widec";
buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm; buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm;
# PKG_CONFIG_LIBDIR is where the *.pc files will be installed. If this preConfigure = lib.optionalString stdenv.isCygwin ''
# directory doesn't exist, the configure script will disable installation of
# *.pc files. The configure script usually (on LSB distros) pick $(path of
# pkg-config)/../lib/pkgconfig. On NixOS that path doesn't exist and is not
# the place we want to put *.pc files from other packages anyway. So we must
# tell it explicitly where to install with PKG_CONFIG_LIBDIR.
preConfigure = ''
export configureFlags="$configureFlags --includedir=$out/include"
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
''; '';
@ -46,6 +40,11 @@ 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).