diff options
| author | Adam Joseph <adam@westernsemico.com> | 2023-08-14 02:49:53 +0300 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2023-08-14 02:51:10 +0300 |
| commit | cbc8aa437c44c510b54c664364dbfbcd98ac5f18 (patch) | |
| tree | ae1007b5847b91704edd9ab87458d8b5c3374f11 /pkgs/os-specific/bsd | |
| parent | a1fdbae706c846f01c31bbe02cb8246fa348b480 (diff) | |
| download | nixpkgs-cbc8aa437c44c510b54c664364dbfbcd98ac5f18.tar nixpkgs-cbc8aa437c44c510b54c664364dbfbcd98ac5f18.tar.gz nixpkgs-cbc8aa437c44c510b54c664364dbfbcd98ac5f18.tar.bz2 nixpkgs-cbc8aa437c44c510b54c664364dbfbcd98ac5f18.tar.lz nixpkgs-cbc8aa437c44c510b54c664364dbfbcd98ac5f18.tar.xz nixpkgs-cbc8aa437c44c510b54c664364dbfbcd98ac5f18.tar.zst nixpkgs-cbc8aa437c44c510b54c664364dbfbcd98ac5f18.zip | |
treewide: use uncurried version of makeScopeWithSplicing
Diffstat (limited to 'pkgs/os-specific/bsd')
| -rw-r--r-- | pkgs/os-specific/bsd/freebsd/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/os-specific/bsd/netbsd/default.nix | 15 |
2 files changed, 13 insertions, 15 deletions
diff --git a/pkgs/os-specific/bsd/freebsd/default.nix b/pkgs/os-specific/bsd/freebsd/default.nix index 136c9721c6b..ff9f4d911f0 100644 --- a/pkgs/os-specific/bsd/freebsd/default.nix +++ b/pkgs/os-specific/bsd/freebsd/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, stdenvNoCC -, makeScopeWithSplicing, generateSplicesForMkScope +, makeScopeWithSplicing', generateSplicesForMkScope , buildPackages , bsdSetupHook, makeSetupHook , fetchgit, fetchzip, coreutils, groff, mandoc, byacc, flex, which, m4, gawk, substituteAll, runtimeShell @@ -66,11 +66,9 @@ let done ''; -in makeScopeWithSplicing - (generateSplicesForMkScope "freebsd") - (_: {}) - (_: {}) - (self: let +in makeScopeWithSplicing' { + otherSplices = generateSplicesForMkScope "freebsd"; + f = (self: let inherit (self) mkDerivation; in { inherit freebsdSrc; @@ -898,4 +896,5 @@ in makeScopeWithSplicing ''; }); -}) +}); +} diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 11d8aa2ec3b..5012a0c7d3c 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, stdenvNoCC -, makeScopeWithSplicing, generateSplicesForMkScope +, makeScopeWithSplicing', generateSplicesForMkScope , buildPackages , bsdSetupHook, makeSetupHook, fetchcvs, groff, mandoc, byacc, flex , zlib @@ -26,17 +26,15 @@ let else "no"}" ]; -in makeScopeWithSplicing - (generateSplicesForMkScope "netbsd") - (_: {}) - (_: {}) - (self: let +in makeScopeWithSplicing' { + otherSplices = generateSplicesForMkScope "netbsd"; + f = (self: let inherit (self) mkDerivation; in { # Why do we have splicing and yet do `nativeBuildInputs = with self; ...`? # - # We use `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`. @@ -1011,4 +1009,5 @@ in makeScopeWithSplicing # END MISCELLANEOUS # -}) +}); +} |