all-packages.nix: add adns library
This commit also adds the combinator 'getPkgConfig', which ADNS uses to let the user enable/disable static linking of the library. The behavior of the adns expression can be customized in ~/.nixpkgs/config.nix by setting, i.e., "adns = { version = "1.4"; static = true; };". svn path=/nixpkgs/trunk/; revision=12155
This commit is contained in:
parent
1f42cdde48
commit
0f3550682b
@ -129,6 +129,9 @@ let pkgs = rec {
|
||||
# a default value if the attribute doesn't exist.
|
||||
getConfig = attrPath: default: lib.getAttr attrPath default config;
|
||||
|
||||
# Return the first available value in the order: pkg.val, val, or default.
|
||||
getPkgConfig = pkg : val : default : (getConfig [ pkg val ] (getConfig [ val ] default));
|
||||
|
||||
# Return user-choosen version of given package. If you define package as
|
||||
#
|
||||
# pkgname_alts =
|
||||
@ -2282,6 +2285,11 @@ let pkgs = rec {
|
||||
inherit stdenv fetchurl gettext attr libtool;
|
||||
});
|
||||
|
||||
adns = selectVersion ../development/libraries/adns "1.4" {
|
||||
inherit stdenv fetchurl;
|
||||
static = getPkgConfig "adns" "static" (stdenv ? isStatic || stdenv ? isDietLibC);
|
||||
};
|
||||
|
||||
agg = import ../development/libraries/agg {
|
||||
inherit fetchurl stdenv autoconf automake libtool pkgconfig
|
||||
freetype SDL;
|
||||
|
Loading…
x
Reference in New Issue
Block a user