diff options
Diffstat (limited to 'pkgs/development/libraries/ncurses/default.nix')
-rw-r--r-- | pkgs/development/libraries/ncurses/default.nix | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index c505d89a6d8f..046c7347f863 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -1,38 +1,39 @@ -{ lib, stdenv, fetchurl +{ lib, stdenv, fetchurl, pkgconfig, libtool , mouseSupport ? false , unicode ? true , gpm - -# Extra Options -, abiVersion ? "5" }: stdenv.mkDerivation rec { - name = "ncurses-5.9"; + name = "ncurses-6.0"; src = fetchurl { url = "mirror://gnu/ncurses/${name}.tar.gz"; - sha256 = "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh"; + sha256 = "0q3jck7lna77z5r42f13c4xglc7azd19pxfrjrpgp2yf615w4lgm"; }; - # gcc-5.patch should be removed after 5.9 - patches = [ ./clang.patch ./gcc-5.patch ]; + patches = [ ./clang.patch ]; configureFlags = [ "--with-shared" + "--with-cxx-shared" + "--with-libtool" "--without-debug" + "--enable-overwrite" # Needed for proper header installation "--enable-pc-files" "--enable-symlinks" ] ++ lib.optional unicode "--enable-widec"; + nativeBuildInputs = [ pkgconfig libtool ]; buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm; preConfigure = '' configureFlagsArray+=("--includedir=$out/include") export PKG_CONFIG_LIBDIR="$out/lib/pkgconfig" mkdir -p "$PKG_CONFIG_LIBDIR" + configureFlagsArray+=("--with-pkg-config-libdir=$PKG_CONFIG_LIBDIR") '' + lib.optionalString stdenv.isCygwin '' sed -i -e 's,LIB_SUFFIX="t,LIB_SUFFIX=",' configure ''; @@ -69,7 +70,6 @@ stdenv.mkDerivation rec { for dylibtype in so dll dylib; do if [ -e "$out/lib/lib''${lib}$suffix.$dylibtype" ]; then ln -svf lib''${lib}$suffix.$dylibtype $out/lib/lib$lib$newsuffix.$dylibtype - ln -svf lib''${lib}$suffix.$dylibtype.${abiVersion} $out/lib/lib$lib$newsuffix.$dylibtype.${abiVersion} fi done for statictype in a dll.a la; do @@ -82,10 +82,6 @@ stdenv.mkDerivation rec { done ''; - preFixup = '' - rm $out/lib/*.a - ''; - meta = { description = "Free software emulation of curses in SVR4 and more"; @@ -112,6 +108,6 @@ stdenv.mkDerivation rec { passthru = { ldflags = "-lncurses"; - inherit unicode abiVersion; + inherit unicode; }; } |