makeInitrd, makeModulesClosure: reduce repetition

After #9869.
NixOS · Sep 15, 2015 · b5ee55f · b5ee55f · aszlig · Sep 16, 2015
1 parent 46ae0a0
commit b5ee55f
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -424,17 +424,13 @@ let
 
   makeAutostartItem = callPackage ../build-support/make-startupitem { };
 
-  makeInitrd = { contents, compressor ? "gzip -9n", prepend ? [ ] }:
-    callPackage ../build-support/kernel/make-initrd.nix {
-      inherit contents compressor prepend;
-    };
+  makeInitrd = { contents, compressor ? "gzip -9n", prepend ? [ ] }@args:
+    callPackage ../build-support/kernel/make-initrd.nix args;
 
   makeWrapper = makeSetupHook { } ../build-support/setup-hooks/make-wrapper.sh;
 
-  makeModulesClosure = { kernel, rootModules, allowMissing ? false }:
-    callPackage ../build-support/kernel/modules-closure.nix {
-      inherit kernel rootModules allowMissing;
-    };
+  makeModulesClosure = { kernel, rootModules, allowMissing ? false }@args:
+    callPackage ../build-support/kernel/modules-closure.nix args;
 
   pathsFromGraph = ../build-support/kernel/paths-from-graph.pl;