alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

* stdenv.mkDerivation: add any attributes in the "passthru" attribute

Browse source 
set to the result, but don't use them in the actual derivation (so
  they're not inputs).  Useful to pass through extra attributes that
  are not inputs, but should be made available to Nix expressions
  using the derivation (e.g., in assertions).

svn path=/nixpkgs/trunk/; revision=6521
This commit is contained in:
Eelco Dolstra 2006-09-14 13:30:47 +00:00
parent 8e5b302403
commit 1014ca2ad5
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/libraries/qt-3/default.nix
View file

@ -57,4 +57,6 @@ stdenv.mkDerivation {
# randr.h and Xrandr.h need not be in the same prefix. # randr.h and Xrandr.h need not be in the same prefix.
./xrandr.patch ./xrandr.patch
]; ];
passthru = {inherit mysqlSupport;};
} }

11
pkgs/stdenv/generic/default.nix
View file

@ -31,7 +31,7 @@ let {
# stdenv and its shell. # stdenv and its shell.
mkDerivation = attrs: mkDerivation = attrs:
(derivation ( (derivation (
(removeAttrs attrs ["meta"]) (removeAttrs attrs ["meta" "passthru"])
// //
{ {
builder = if attrs ? realBuilder then attrs.realBuilder else shell; builder = if attrs ? realBuilder then attrs.realBuilder else shell;
@ -41,13 +41,18 @@ let {
system = result.system; system = result.system;
}) })
) )
//
# The meta attribute is passed in the resulting attribute set, # The meta attribute is passed in the resulting attribute set,
# but it's not part of the actual derivation, i.e., it's not # but it's not part of the actual derivation, i.e., it's not
# passed to the builder and is not a dependency. But since we # passed to the builder and is not a dependency. But since we
# include it in the result, it *is* available to nix-env for # include it in the result, it *is* available to nix-env for
# queries. # queries.
{ meta = if attrs ? meta then attrs.meta else {}; }; //
{ meta = if attrs ? meta then attrs.meta else {}; }
# Pass through extra attributes that are not inputs, but
# should be made available to Nix expressions using the
# derivation (e.g., in assertions).
//
(if attrs ? passthru then attrs.passthru else {});
# Utility value: is this a Darwin system? # Utility value: is this a Darwin system?
isDarwin = result.system == "i686-darwin" || result.system == "powerpc-darwin"; isDarwin = result.system == "i686-darwin" || result.system == "powerpc-darwin";