mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
Removed legacy getFlag function
svn path=/nixpkgs/trunk/; revision=10326
This commit is contained in:
parent
36eb082dab
commit
6ed85d8e95
1 changed files with 1 additions and 6 deletions
|
@ -155,11 +155,6 @@ rec {
|
||||||
version = getConfig [ "environment" "versions" name ];
|
version = getConfig [ "environment" "versions" name ];
|
||||||
};
|
};
|
||||||
|
|
||||||
# Whether user enabled given feature for the given package?
|
|
||||||
getFlag = flag: package: default:
|
|
||||||
getConfig [ "environment" "flags" package flag ]
|
|
||||||
(getConfig [ "environment" "flags" "default" flag ] default);
|
|
||||||
|
|
||||||
# The contents of the configuration file found at $NIXPKGS_CONFIG or
|
# The contents of the configuration file found at $NIXPKGS_CONFIG or
|
||||||
# $HOME/.nixpkgs/config.nix.
|
# $HOME/.nixpkgs/config.nix.
|
||||||
config =
|
config =
|
||||||
|
@ -2420,7 +2415,7 @@ rec {
|
||||||
|
|
||||||
pcre = import ../development/libraries/pcre {
|
pcre = import ../development/libraries/pcre {
|
||||||
inherit fetchurl stdenv;
|
inherit fetchurl stdenv;
|
||||||
unicodeSupport = getFlag "unicode" "pcre" false;
|
unicodeSupport = getConfig ["pcre" "unicode"] false;
|
||||||
};
|
};
|
||||||
|
|
||||||
poppler = import ../development/libraries/poppler {
|
poppler = import ../development/libraries/poppler {
|
||||||
|
|
Loading…
Reference in a new issue