diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-20 14:43:41 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-30 17:20:32 -0400 |
| commit | 0828e2d8c369604c56219bd7085256b984087280 (patch) | |
| tree | 507e0429674ad3a42bf5dcd11413d3c834f95c74 /pkgs/top-level/splice.nix | |
| parent | 2c2f1e37d4374ea61caefd9389927ea03df4ce31 (diff) | |
treewide: Remove usage of remaining redundant platform compatability stuff
Want to get this out of here for 18.09, so it can be deprecated
thereafter.
Diffstat (limited to 'pkgs/top-level/splice.nix')
| -rw-r--r-- | pkgs/top-level/splice.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index 27e8136cd397..41fdc22d1477 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -27,9 +27,9 @@ let defaultBuildBuildScope = pkgs.buildPackages.buildPackages // pkgs.buildPackages.buildPackages.xorg; defaultBuildHostScope = pkgs.buildPackages // pkgs.buildPackages.xorg; defaultBuildTargetScope = - if pkgs.targetPlatform == pkgs.hostPlatform + if pkgs.stdenv.targetPlatform == pkgs.stdenv.hostPlatform then defaultBuildHostScope - else assert pkgs.hostPlatform == pkgs.buildPlatform; defaultHostTargetScope; + else assert pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform; defaultHostTargetScope; defaultHostHostScope = {}; # unimplemented defaultHostTargetScope = pkgs // pkgs.xorg; defaultTargetTargetScope = pkgs.targetPackages // pkgs.targetPackages.xorg or {}; @@ -114,8 +114,8 @@ let pkgsTargetTarget = defaultTargetTargetScope; } // { # These should never be spliced under any circumstances - inherit (pkgs) pkgs buildPackages targetPackages - buildPlatform targetPlatform hostPlatform; + inherit (pkgs) pkgs buildPackages targetPackages; + inherit (pkgs.stdenv) buildPlatform targetPlatform hostPlatform; }; in |