diff options
| author | Will Dietz <w@wdtz.org> | 2017-12-22 16:05:33 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-07-09 11:07:10 -0400 |
| commit | 218d4dc154faca85c5e0024c6ab7bf2d1ddac0a5 (patch) | |
| tree | 031fea218d440643effc32610e71929c899c040d /pkgs/top-level/splice.nix | |
| parent | 5c271db791c1538c5cbcbb8845e0fa0f1e1abfd8 (diff) | |
make-derivation: Don't add host-suffix to fixed-output derivations names
Not only does the suffix unnecessarily reduce sharing, but it also breaks
unpacker setup hooks (e.g. that of `unzip`) which identify interesting tarballs
using the file extension.
This also means we can get rid of the splicing hacks for fetchers.
Diffstat (limited to 'pkgs/top-level/splice.nix')
| -rw-r--r-- | pkgs/top-level/splice.nix | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index 1fde08d1d48b..078075323dd0 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -31,13 +31,8 @@ let then defaultBuildHostScope else assert pkgs.hostPlatform == pkgs.buildPlatform; defaultHostTargetScope; defaultHostHostScope = {}; # unimplemented - # TODO(@Ericson2314): we shouldn't preclude run-time fetching by removing - # these attributes. We should have a more general solution for selecting - # whether `nativeDrv` or `crossDrv` is the default in `defaultScope`. - pkgsWithoutFetchers = lib.filterAttrs (n: _: !lib.hasPrefix "fetch" n) pkgs; - targetPkgsWithoutFetchers = lib.filterAttrs (n: _: !lib.hasPrefix "fetch" n) pkgs.targetPackages; - defaultHostTargetScope = pkgsWithoutFetchers // pkgs.xorg; - defaultTargetTargetScope = targetPkgsWithoutFetchers // targetPkgsWithoutFetchers.xorg or {}; + defaultHostTargetScope = pkgs // pkgs.xorg; + defaultTargetTargetScope = pkgs.targetPackages // pkgs.targetPackages.xorg or {}; splicer = pkgsBuildBuild: pkgsBuildHost: pkgsBuildTarget: pkgsHostHost: pkgsHostTarget: |