public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linuxPackages.spl: eval, 84d8ef6e2f

Browse Source 
Second attempt.
This commit is contained in:
Yegor Timoshenko 2017-12-30 00:28:37 +00:00
parent f497999e86
commit 0d321897fb
No known key found for this signature in database
GPG Key ID: C34BF9DCC9DF8210
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/zfs/default.nix
View File

@ -39,7 +39,7 @@ let
patches = extraPatches; patches = extraPatches;
nativeBuildInputs = [ autoreconfHook nukeReferences ] nativeBuildInputs = [ autoreconfHook nukeReferences ]
++ optional buildUser kernel.moduleBuildDependencies; ++ optional buildKernel kernel.moduleBuildDependencies;
buildInputs = buildInputs =
optionals buildKernel [ spl ] optionals buildKernel [ spl ]
++ optionals buildUser [ zlib libuuid python attr ] ++ optionals buildUser [ zlib libuuid python attr ]

9
pkgs/top-level/all-packages.nix
View File

@ -12888,9 +12888,8 @@ with pkgs;
sch_cake = callPackage ../os-specific/linux/sch_cake { }; sch_cake = callPackage ../os-specific/linux/sch_cake { };
inherit (callPackage ../os-specific/linux/spl { inherit (callPackage ../os-specific/linux/spl {})
inherit kernel; splStable splUnstable;
}) splStable splUnstable;
spl = splStable; spl = splStable;
@ -13221,10 +13220,6 @@ with pkgs;
statifier = callPackage ../os-specific/linux/statifier { }; statifier = callPackage ../os-specific/linux/statifier { };
inherit (callPackage ../os-specific/linux/spl {
configFile = "user";
}) splStable splUnstable;
sysdig = callPackage ../os-specific/linux/sysdig { sysdig = callPackage ../os-specific/linux/sysdig {
kernel = null; kernel = null;
}; # pkgs.sysdig is a client, for a driver look at linuxPackagesFor }; # pkgs.sysdig is a client, for a driver look at linuxPackagesFor