diff options
| -rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 7e28a00300c..b0c9299ccbb 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -39,7 +39,7 @@ let patches = extraPatches; nativeBuildInputs = [ autoreconfHook nukeReferences ] - ++ optional buildUser kernel.moduleBuildDependencies; + ++ optional buildKernel kernel.moduleBuildDependencies; buildInputs = optionals buildKernel [ spl ] ++ optionals buildUser [ zlib libuuid python attr ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47730795ba8..ef3c8f4d3f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12888,9 +12888,8 @@ with pkgs; sch_cake = callPackage ../os-specific/linux/sch_cake { }; - inherit (callPackage ../os-specific/linux/spl { - inherit kernel; - }) splStable splUnstable; + inherit (callPackage ../os-specific/linux/spl {}) + splStable splUnstable; spl = splStable; @@ -13221,10 +13220,6 @@ with pkgs; statifier = callPackage ../os-specific/linux/statifier { }; - inherit (callPackage ../os-specific/linux/spl { - configFile = "user"; - }) splStable splUnstable; - sysdig = callPackage ../os-specific/linux/sysdig { kernel = null; }; # pkgs.sysdig is a client, for a driver look at linuxPackagesFor |