* Idem.
svn path=/nixpkgs/trunk/; revision=14779
This commit is contained in:
parent
2405d87230
commit
5e294459e3
@ -113,8 +113,7 @@ let
|
|||||||
|
|
||||||
inherit lib config getConfig;
|
inherit lib config getConfig;
|
||||||
|
|
||||||
addAttrsToDerivation = extraAttrs: stdenv: stdenv //
|
inherit (lib) lowPrio appendToName;
|
||||||
{ mkDerivation = args: stdenv.mkDerivation (args // extraAttrs); };
|
|
||||||
|
|
||||||
stdenvNew = overrideSetup stdenv ../stdenv/generic/setup-new.sh;
|
stdenvNew = overrideSetup stdenv ../stdenv/generic/setup-new.sh;
|
||||||
|
|
||||||
@ -151,22 +150,6 @@ let
|
|||||||
version = getConfig [ "environment" "versions" name ];
|
version = getConfig [ "environment" "versions" name ];
|
||||||
};
|
};
|
||||||
|
|
||||||
# Change the symbolic name of a package for presentation purposes
|
|
||||||
# (i.e., so that nix-env users can tell them apart).
|
|
||||||
setName = name: drv: drv // {inherit name;};
|
|
||||||
|
|
||||||
updateName = updater: drv: drv // {name = updater (drv.name);};
|
|
||||||
|
|
||||||
# !!! the suffix should really be appended *before* the version, at
|
|
||||||
# least most of the time.
|
|
||||||
appendToName = suffix: updateName (name: "${name}-${suffix}");
|
|
||||||
|
|
||||||
# Decrease the priority of the package, i.e., other
|
|
||||||
# versions/variants will be preferred.
|
|
||||||
lowPrio = drv: drv // {
|
|
||||||
meta = (if drv ? meta then drv.meta else {}) // {priority = "10";};
|
|
||||||
};
|
|
||||||
|
|
||||||
# Check absence of non-used options
|
# Check absence of non-used options
|
||||||
checker = x: flag: opts: config:
|
checker = x: flag: opts: config:
|
||||||
(if flag then let result=(
|
(if flag then let result=(
|
||||||
|
Loading…
x
Reference in New Issue
Block a user