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/freebsd/default.nix | |
| parent | 665e15ee407ea3d08c80344fa1da2bad34e78650 (diff) | |
| download | nixlib-58fa78077c937e1879a20fc66fe7c6c57e4f75b7.tar nixlib-58fa78077c937e1879a20fc66fe7c6c57e4f75b7.tar.gz nixlib-58fa78077c937e1879a20fc66fe7c6c57e4f75b7.tar.bz2 nixlib-58fa78077c937e1879a20fc66fe7c6c57e4f75b7.tar.lz nixlib-58fa78077c937e1879a20fc66fe7c6c57e4f75b7.tar.xz nixlib-58fa78077c937e1879a20fc66fe7c6c57e4f75b7.tar.zst nixlib-58fa78077c937e1879a20fc66fe7c6c57e4f75b7.zip | |
treewide: use splicing convenience functions
Diffstat (limited to 'pkgs/os-specific/bsd/freebsd/default.nix')
| -rw-r--r-- | pkgs/os-specific/bsd/freebsd/default.nix | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/pkgs/os-specific/bsd/freebsd/default.nix b/pkgs/os-specific/bsd/freebsd/default.nix index 86c63fc50654..3a53916a46de 100644 --- a/pkgs/os-specific/bsd/freebsd/default.nix +++ b/pkgs/os-specific/bsd/freebsd/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, stdenvNoCC -, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, pkgsHostHost, pkgsTargetTarget -, buildPackages, splicePackages, newScope +, makeScopeWithSplicing, generateSplicesForMkScope +, buildPackages , bsdSetupHook, makeSetupHook , fetchgit, fetchurl, coreutils, groff, mandoc, byacc, flex, which, m4, gawk, substituteAll, runtimeShell , zlib, expat, libmd @@ -24,14 +24,6 @@ let name = "freebsd-setup-hook"; } ./setup-hook.sh; - otherSplices = { - selfBuildBuild = pkgsBuildBuild.freebsd; - selfBuildHost = pkgsBuildHost.freebsd; - selfBuildTarget = pkgsBuildTarget.freebsd; - selfHostHost = pkgsHostHost.freebsd; - selfTargetTarget = pkgsTargetTarget.freebsd or {}; # might be missing - }; - mkBsdArch = stdenv': { x86_64 = "amd64"; aarch64 = "arm64"; @@ -74,10 +66,8 @@ let done ''; -in lib.makeScopeWithSplicing - splicePackages - newScope - otherSplices +in makeScopeWithSplicing + (generateSplicesForMkScope "freebsd") (_: {}) (_: {}) (self: let |