diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-07-26 15:14:33 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-07-26 15:14:33 -0400 |
| commit | 8c7910083976e255300efa797030448f5a1cb864 (patch) | |
| tree | afbd7a37d0724feb408a2d025364ed3938b5673a /corepkgs | |
| parent | aa115e22df1c80e8878237a9e704d7d70783a243 (diff) | |
| parent | 3a4623afbbc1bff85bde33167d36e8c5a4a3df0d (diff) | |
Merge branch 'master' into no-manifests
Diffstat (limited to 'corepkgs')
| -rw-r--r-- | corepkgs/Makefile.am | 3 | ||||
| -rw-r--r-- | corepkgs/imported-drv-to-derivation.nix | 21 |
2 files changed, 23 insertions, 1 deletions
diff --git a/corepkgs/Makefile.am b/corepkgs/Makefile.am index 729d15e7b..4b0b8860b 100644 --- a/corepkgs/Makefile.am +++ b/corepkgs/Makefile.am @@ -1,6 +1,7 @@ all-local: config.nix -files = nar.nix buildenv.nix buildenv.pl unpack-channel.nix unpack-channel.sh derivation.nix fetchurl.nix +files = nar.nix buildenv.nix buildenv.pl unpack-channel.nix unpack-channel.sh derivation.nix fetchurl.nix \ + imported-drv-to-derivation.nix install-exec-local: $(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs diff --git a/corepkgs/imported-drv-to-derivation.nix b/corepkgs/imported-drv-to-derivation.nix new file mode 100644 index 000000000..bdb601698 --- /dev/null +++ b/corepkgs/imported-drv-to-derivation.nix @@ -0,0 +1,21 @@ +attrs @ { drvPath, outputs, ... }: + +let + + commonAttrs = (builtins.listToAttrs outputsList) // + { all = map (x: x.value) outputsList; + inherit drvPath; + type = "derivation"; + }; + + outputToAttrListElement = outputName: + { name = outputName; + value = commonAttrs // { + outPath = builtins.getAttr outputName attrs; + inherit outputName; + }; + }; + + outputsList = map outputToAttrListElement outputs; + +in (builtins.head outputsList).value |