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/tools/package-management | |
parent | 2c2f1e37d4374ea61caefd9389927ea03df4ce31 (diff) | |
download | nixlib-0828e2d8c369604c56219bd7085256b984087280.tar nixlib-0828e2d8c369604c56219bd7085256b984087280.tar.gz nixlib-0828e2d8c369604c56219bd7085256b984087280.tar.bz2 nixlib-0828e2d8c369604c56219bd7085256b984087280.tar.lz nixlib-0828e2d8c369604c56219bd7085256b984087280.tar.xz nixlib-0828e2d8c369604c56219bd7085256b984087280.tar.zst nixlib-0828e2d8c369604c56219bd7085256b984087280.zip |
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/tools/package-management')
-rw-r--r-- | pkgs/tools/package-management/cargo-edit/cargo-edit.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/package-management/cargo-update/cargo-update.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 5 |
3 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/tools/package-management/cargo-edit/cargo-edit.nix b/pkgs/tools/package-management/cargo-edit/cargo-edit.nix index 67aa52f47894..7224c11f183f 100644 --- a/pkgs/tools/package-management/cargo-edit/cargo-edit.nix +++ b/pkgs/tools/package-management/cargo-edit/cargo-edit.nix @@ -2,7 +2,7 @@ { pkgs }: with pkgs; -let kernel = buildPlatform.parsed.kernel.name; +let kernel = stdenv.buildPlatform.parsed.kernel.name; updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); mapFeatures = features: map (fun: fun { features = features; }); mkFeatures = feat: lib.lists.foldl (features: featureName: diff --git a/pkgs/tools/package-management/cargo-update/cargo-update.nix b/pkgs/tools/package-management/cargo-update/cargo-update.nix index 83fdaad5bfdb..1bd8aadf4982 100644 --- a/pkgs/tools/package-management/cargo-update/cargo-update.nix +++ b/pkgs/tools/package-management/cargo-update/cargo-update.nix @@ -1,7 +1,7 @@ # Generated by carnix 0.6.6: carnix -o cargo-update.nix --src ./. Cargo.lock --standalone -{ lib, buildPlatform, buildRustCrate, fetchgit }: -let kernel = buildPlatform.parsed.kernel.name; - abi = buildPlatform.parsed.abi.name; +{ lib, stdenv, buildRustCrate, fetchgit }: +let kernel = stdenv.hostPlatform.parsed.kernel.name; + abi = stdenv.hostPlatform.parsed.abi.name; include = includedFiles: src: builtins.filterSource (path: type: lib.lists.any (f: let p = toString (src + ("/" + f)); in diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index c06a4f41afb1..bc07dd457f38 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -2,7 +2,6 @@ , pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli, boost , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns , busybox-sandbox-shell -, hostPlatform, buildPlatform , storeDir ? "/nix/store" , stateDir ? "/nix/var" , confDir ? "/etc" @@ -73,8 +72,8 @@ let "--with-sandbox-shell=${sh}/bin/busybox" ] ++ lib.optional ( - hostPlatform != buildPlatform && hostPlatform ? nix && hostPlatform.nix ? system - ) ''--with-system=${hostPlatform.nix.system}'' + stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform ? nix && stdenv.hostPlatform.nix ? system + ) ''--with-system=${stdenv.hostPlatform.nix.system}'' # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50 ++ lib.optional (!libseccomp.meta.available) "--disable-seccomp-sandboxing"; |