diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-12-04 14:30:34 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-12-04 14:30:34 +0100 |
| commit | 2d5e8e267b58f531f00b043c9e3dbaefad62a4a1 (patch) | |
| tree | 7ffc983e9b68fdfed02f39013d747dc901449164 /corepkgs | |
| parent | 5ad89398d12bf8bc83426036dedc2c601ff8f795 (diff) | |
Add a test for ‘nix-env --set-flag active ...’
Diffstat (limited to 'corepkgs')
| -rw-r--r-- | corepkgs/buildenv.nix | 2 | ||||
| -rw-r--r-- | corepkgs/buildenv.pl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/corepkgs/buildenv.nix b/corepkgs/buildenv.nix index 923778379..c52a0ea93 100644 --- a/corepkgs/buildenv.nix +++ b/corepkgs/buildenv.nix @@ -13,7 +13,7 @@ derivation { # !!! grmbl, need structured data for passing this in a clean way. derivations = map (d: - [ (if d.meta.active or true then "1" else "0") + [ (d.meta.active or "true") (d.meta.priority or 5) (builtins.length d.outputs) ] ++ map (output: builtins.getAttr output d) d.outputs) diff --git a/corepkgs/buildenv.pl b/corepkgs/buildenv.pl index 3d79e5031..ea517687b 100644 --- a/corepkgs/buildenv.pl +++ b/corepkgs/buildenv.pl @@ -134,7 +134,7 @@ while (scalar @derivations) { for (my $n = 0; $n < $outputs; $n++) { my $path = shift @derivations; $pkgs{$path} = - { active => int($active) + { active => $active ne "false" , priority => int($priority) }; } } |