diff options
author | Artturin <Artturin@artturin.com> | 2022-12-24 17:44:09 +0200 |
---|---|---|
committer | Artturin <Artturin@artturin.com> | 2022-12-25 14:05:03 +0200 |
commit | 58fa78077c937e1879a20fc66fe7c6c57e4f75b7 (patch) | |
tree | 08b5beba6b171cc7c70036aaac300f9bd3b1727e /pkgs/os-specific/bsd/netbsd | |
parent | 665e15ee407ea3d08c80344fa1da2bad34e78650 (diff) | |
download | nixpkgs-58fa78077c937e1879a20fc66fe7c6c57e4f75b7.tar nixpkgs-58fa78077c937e1879a20fc66fe7c6c57e4f75b7.tar.gz nixpkgs-58fa78077c937e1879a20fc66fe7c6c57e4f75b7.tar.bz2 nixpkgs-58fa78077c937e1879a20fc66fe7c6c57e4f75b7.tar.lz nixpkgs-58fa78077c937e1879a20fc66fe7c6c57e4f75b7.tar.xz nixpkgs-58fa78077c937e1879a20fc66fe7c6c57e4f75b7.tar.zst nixpkgs-58fa78077c937e1879a20fc66fe7c6c57e4f75b7.zip |
treewide: use splicing convenience functions
Diffstat (limited to 'pkgs/os-specific/bsd/netbsd')
-rw-r--r-- | pkgs/os-specific/bsd/netbsd/default.nix | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 4219706a352..37a0c35b186 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, stdenvNoCC -, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, pkgsHostHost, pkgsTargetTarget -, buildPackages, splicePackages, newScope +, makeScopeWithSplicing, generateSplicesForMkScope +, buildPackages , bsdSetupHook, makeSetupHook, fetchcvs, groff, mandoc, byacc, flex , zlib , writeShellScript, writeText, runtimeShell, symlinkJoin @@ -20,24 +20,14 @@ let name = "netbsd-setup-hook"; } ./setup-hook.sh; - otherSplices = { - selfBuildBuild = pkgsBuildBuild.netbsd; - selfBuildHost = pkgsBuildHost.netbsd; - selfBuildTarget = pkgsBuildTarget.netbsd; - selfHostHost = pkgsHostHost.netbsd; - selfTargetTarget = pkgsTargetTarget.netbsd or {}; # might be missing - }; - defaultMakeFlags = [ "MKSOFTFLOAT=${if stdenv.hostPlatform.gcc.float or (stdenv.hostPlatform.parsed.abi.float or "hard") == "soft" then "yes" else "no"}" ]; -in lib.makeScopeWithSplicing - splicePackages - newScope - otherSplices +in makeScopeWithSplicing + (generateSplicesForMkScope "netbsd") (_: {}) (_: {}) (self: let @@ -46,7 +36,7 @@ in lib.makeScopeWithSplicing # Why do we have splicing and yet do `nativeBuildInputs = with self; ...`? # - # We use `lib.makeScopeWithSplicing` because this should be used for all + # We use `makeScopeWithSplicing` because this should be used for all # nested package sets which support cross, so the inner `callPackage` works # correctly. But for the inline packages we don't bother to use # `callPackage`. |