diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2008-01-25 13:33:26 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2008-01-25 13:33:26 +0000 |
| commit | 746d65bbdb79349dbb1ace4a0d438240a95df2e0 (patch) | |
| tree | b26d83101fd33350c8c362400bbef18407986905 | |
| parent | 4a49a7befc93ef4210808c297684e48fcdd0d510 (diff) | |
| download | nixpkgs-746d65bbdb79349dbb1ace4a0d438240a95df2e0.tar nixpkgs-746d65bbdb79349dbb1ace4a0d438240a95df2e0.tar.gz nixpkgs-746d65bbdb79349dbb1ace4a0d438240a95df2e0.tar.bz2 nixpkgs-746d65bbdb79349dbb1ace4a0d438240a95df2e0.tar.lz nixpkgs-746d65bbdb79349dbb1ace4a0d438240a95df2e0.tar.xz nixpkgs-746d65bbdb79349dbb1ace4a0d438240a95df2e0.tar.zst nixpkgs-746d65bbdb79349dbb1ace4a0d438240a95df2e0.zip | |
Minor change to composing templates.
svn path=/nixpkgs/trunk/; revision=10294
| -rw-r--r-- | pkgs/top-level/template-composing+config.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/template-composing-builder.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/top-level/template-composing+config.nix b/pkgs/top-level/template-composing+config.nix index 7ff4f3f9d50..172cd9c4797 100644 --- a/pkgs/top-level/template-composing+config.nix +++ b/pkgs/top-level/template-composing+config.nix @@ -1,4 +1,4 @@ -args : with args; let localDefs = builderDefs (args // { +args : with args; let localDefs = builderDefs (args // rec { src = /* put a fetchurl here */ (abort "Specify source"); useConfig = true; diff --git a/pkgs/top-level/template-composing-builder.nix b/pkgs/top-level/template-composing-builder.nix index 276bdc762dc..88bf2b63cfa 100644 --- a/pkgs/top-level/template-composing-builder.nix +++ b/pkgs/top-level/template-composing-builder.nix @@ -1,10 +1,10 @@ args : with args; with builderDefs {src="";} null; - let localDefs = builderDefs { + let localDefs = builderDefs (rec { src = /* put a fetchurl here */ buildInputs = []; configureFlags = []; - } null; /* null is a terminator for sumArgs */ + }) null; /* null is a terminator for sumArgs */ in with localDefs; stdenv.mkDerivation rec { name = "${abort "Specify name"}-"+version; |