diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 538c136a042..051d29924df 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -4,8 +4,8 @@ , gpm ? null # Extra Options +, abiVersion ? "5" , unicode ? true -, abiVersion ? null }: let @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { buildInputs = [ optGpm ]; configureFlags = [ + (mkWith true "abi-version" abiVersion) (mkWith true "cxx" null) (mkWith true "cxx-binding" null) (mkWith false "ada" null) @@ -56,7 +57,7 @@ stdenv.mkDerivation rec { (mkEnable unicode "widec" null) (mkEnable true "ext-colors" null) (mkEnable true "ext-mouse" null) - ] ++ stdenv.lib.optional (abiVersion != null) (mkWith true "abi-version" abiVersion); + ]; # PKG_CONFIG_LIBDIR is where the *.pc files will be installed. If this # directory doesn't exist, the configure script will disable installation of diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8c4c716a25..e3dd92a1e08 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7241,10 +7241,6 @@ let ncurses = callPackage ../development/libraries/ncurses { }; - ncurses5 = callPackage ../development/libraries/ncurses { - abiVersion = "5"; - }; - neon = callPackage ../development/libraries/neon { compressionSupport = true; sslSupport = true; diff --git a/pkgs/top-level/haskell-ng.nix b/pkgs/top-level/haskell-ng.nix index f068b8b9a12..73c0abd4726 100644 --- a/pkgs/top-level/haskell-ng.nix +++ b/pkgs/top-level/haskell-ng.nix @@ -9,13 +9,11 @@ rec { ghc6102Binary = callPackage ../development/compilers/ghc/6.10.2-binary.nix { gmp = pkgs.gmp4; }; ghc704Binary = callPackage ../development/compilers/ghc/7.0.4-binary.nix ({ gmp = pkgs.gmp4; - ncurses = pkgs.ncurses5; } // stdenv.lib.optionalAttrs stdenv.isDarwin { libiconv = pkgs.darwin.libiconv; }); ghc742Binary = callPackage ../development/compilers/ghc/7.4.2-binary.nix ({ gmp = pkgs.gmp4; - ncurses = pkgs.ncurses5; } // stdenv.lib.optionalAttrs stdenv.isDarwin { libiconv = pkgs.darwin.libiconv; });