diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/build-support/kernel/make-initrd.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix index 22761af158af..7ad1affb65a3 100644 --- a/pkgs/build-support/kernel/make-initrd.nix +++ b/pkgs/build-support/kernel/make-initrd.nix @@ -12,11 +12,14 @@ # `contents = {object = ...; symlink = /init;}' is a typical # argument. -{ stdenv, perl, cpio, contents, compressor, prepend, ubootTools +{ stdenv, perl, cpio, contents, ubootTools +, name ? "initrd" +, compressor ? "gzip -9n" +, prepend ? [] }: stdenv.mkDerivation rec { - name = "initrd"; + inherit name; builder = ./make-initrd.sh; makeUInitrd = stdenv.hostPlatform.platform.kernelTarget == "uImage"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c048f4431612..7cdaf9962cb9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -330,10 +330,7 @@ in makeAutostartItem = callPackage ../build-support/make-startupitem { }; - makeInitrd = { contents, compressor ? "gzip -9n", prepend ? [ ] }: - callPackage ../build-support/kernel/make-initrd.nix { - inherit contents compressor prepend; - }; + makeInitrd = callPackage ../build-support/kernel/make-initrd.nix; # Args intentionally left out makeWrapper = makeSetupHook { deps = [ dieHook ]; substitutions = { shell = pkgs.runtimeShell; }; } ../build-support/setup-hooks/make-wrapper.sh; |