diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-09-15 08:51:08 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-09-15 10:03:23 +0200 |
| commit | b5ee55f81f9f65f15f9b807b4de1380a7f477baf (patch) | |
| tree | 6f7e2cf5451d3321d68200e445dae157609dae45 | |
| parent | 46ae0a0c98dcb125fd1e923d328d71ae23e99288 (diff) | |
| download | nixpkgs-b5ee55f81f9f65f15f9b807b4de1380a7f477baf.tar nixpkgs-b5ee55f81f9f65f15f9b807b4de1380a7f477baf.tar.gz nixpkgs-b5ee55f81f9f65f15f9b807b4de1380a7f477baf.tar.bz2 nixpkgs-b5ee55f81f9f65f15f9b807b4de1380a7f477baf.tar.lz nixpkgs-b5ee55f81f9f65f15f9b807b4de1380a7f477baf.tar.xz nixpkgs-b5ee55f81f9f65f15f9b807b4de1380a7f477baf.tar.zst nixpkgs-b5ee55f81f9f65f15f9b807b4de1380a7f477baf.zip | |
makeInitrd, makeModulesClosure: reduce repetition
After #9869.
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f6710c1986..af367e3d49e 100644 --- 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; |