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

ncurses: Cleanup abi version

Browse Source
This commit is contained in:
William A. Kennington III 2015-05-02 13:53:37 -07:00
parent 2325791c2b
commit f73682c526
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,8 +4,8 @@
, gpm ? null , gpm ? null
# Extra Options # Extra Options
, abiVersion ? "5"
, unicode ? true , unicode ? true
, abiVersion ? null
}: }:
let let
@ -35,6 +35,7 @@ stdenv.mkDerivation rec {
buildInputs = [ optGpm ]; buildInputs = [ optGpm ];
configureFlags = [ configureFlags = [
(mkWith true "abi-version" abiVersion)
(mkWith true "cxx" null) (mkWith true "cxx" null)
(mkWith true "cxx-binding" null) (mkWith true "cxx-binding" null)
(mkWith false "ada" null) (mkWith false "ada" null)
@ -56,7 +57,7 @@ stdenv.mkDerivation rec {
(mkEnable unicode "widec" null) (mkEnable unicode "widec" null)
(mkEnable true "ext-colors" null) (mkEnable true "ext-colors" null)
(mkEnable true "ext-mouse" 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 # PKG_CONFIG_LIBDIR is where the *.pc files will be installed. If this
# directory doesn't exist, the configure script will disable installation of # directory doesn't exist, the configure script will disable installation of

4
pkgs/top-level/all-packages.nix
View File

@ -7241,10 +7241,6 @@ let
ncurses = callPackage ../development/libraries/ncurses { }; ncurses = callPackage ../development/libraries/ncurses { };
ncurses5 = callPackage ../development/libraries/ncurses {
abiVersion = "5";
};
neon = callPackage ../development/libraries/neon { neon = callPackage ../development/libraries/neon {
compressionSupport = true; compressionSupport = true;
sslSupport = true; sslSupport = true;

2
pkgs/top-level/haskell-ng.nix
View File

@ -9,13 +9,11 @@ rec {
ghc6102Binary = callPackage ../development/compilers/ghc/6.10.2-binary.nix { gmp = pkgs.gmp4; }; ghc6102Binary = callPackage ../development/compilers/ghc/6.10.2-binary.nix { gmp = pkgs.gmp4; };
ghc704Binary = callPackage ../development/compilers/ghc/7.0.4-binary.nix ({ ghc704Binary = callPackage ../development/compilers/ghc/7.0.4-binary.nix ({
gmp = pkgs.gmp4; gmp = pkgs.gmp4;
ncurses = pkgs.ncurses5;
} // stdenv.lib.optionalAttrs stdenv.isDarwin { } // stdenv.lib.optionalAttrs stdenv.isDarwin {
libiconv = pkgs.darwin.libiconv; libiconv = pkgs.darwin.libiconv;
}); });
ghc742Binary = callPackage ../development/compilers/ghc/7.4.2-binary.nix ({ ghc742Binary = callPackage ../development/compilers/ghc/7.4.2-binary.nix ({
gmp = pkgs.gmp4; gmp = pkgs.gmp4;
ncurses = pkgs.ncurses5;
} // stdenv.lib.optionalAttrs stdenv.isDarwin { } // stdenv.lib.optionalAttrs stdenv.isDarwin {
libiconv = pkgs.darwin.libiconv; libiconv = pkgs.darwin.libiconv;
}); });