diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 11bf657d24da..9e2a0d173ffc 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -1,7 +1,6 @@ { stdenv, lib, fetchpatch , recompressTarball , buildPackages -, buildPlatform , pkgsBuildBuild # Channel data: , channel, upstream-info diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index f7a3a80dff62..45f93f97f245 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,9 +1,9 @@ -{ hostPlatform, callPackage }: +{ stdenv, callPackage }: { signal-desktop = - if hostPlatform.system == "aarch64-linux" then + if stdenv.hostPlatform.system == "aarch64-linux" then callPackage ./signal-desktop-aarch64.nix { } - else if hostPlatform.isDarwin then + else if stdenv.hostPlatform.isDarwin then callPackage ./signal-desktop-darwin.nix { } else callPackage ./signal-desktop.nix { }; diff --git a/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix index 193776fa5ec0..baa95b13c9ed 100644 --- a/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix +++ b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix @@ -1,11 +1,11 @@ { lib , fetchFromGitHub -, hostPlatform +, stdenv , lld }: let - arch = hostPlatform.qemuArch; + arch = stdenv.hostPlatform.qemuArch; target = ./. + "/${arch}-unknown-none.json"; @@ -15,7 +15,7 @@ assert lib.assertMsg (builtins.pathExists target) "Target spec not found"; let cross = import ../../../.. { - system = hostPlatform.system; + system = stdenv.hostPlatform.system; crossSystem = lib.systems.examples."${arch}-embedded" // { rust.rustcTarget = "${arch}-unknown-none"; rust.platform = lib.importJSON target; diff --git a/pkgs/by-name/bo/bombsquad/package.nix b/pkgs/by-name/bo/bombsquad/package.nix index 08b80d8b37b8..078d12df8dd7 100644 --- a/pkgs/by-name/bo/bombsquad/package.nix +++ b/pkgs/by-name/bo/bombsquad/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - targetPlatform, fetchurl, python312, SDL2, @@ -30,7 +29,7 @@ let hash = "sha256-o1Yg0C5k07NZzc9jQrHXR+kkQl8HZ55U9/fqcpe3Iyw="; }; } - .${targetPlatform.system} or (throw "${targetPlatform.system} is unsupported."); + .${stdenv.targetPlatform.system} or (throw "${stdenv.targetPlatform.system} is unsupported."); in stdenv.mkDerivation (finalAttrs: { pname = "bombsquad"; diff --git a/pkgs/by-name/pu/pupdate/package.nix b/pkgs/by-name/pu/pupdate/package.nix index decad3e4f75c..2c3121a39ba1 100644 --- a/pkgs/by-name/pu/pupdate/package.nix +++ b/pkgs/by-name/pu/pupdate/package.nix @@ -5,7 +5,6 @@ , dotnetCorePackages , openssl , zlib -, hostPlatform , nix-update-script }: @@ -30,7 +29,7 @@ buildDotnetModule rec { patches = [ ./add-runtime-identifier.patch ]; postPatch = '' substituteInPlace pupdate.csproj \ - --replace @RuntimeIdentifier@ "${dotnetCorePackages.systemToDotnetRid hostPlatform.system}" + --replace @RuntimeIdentifier@ "${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}" ''; projectFile = "pupdate.csproj"; diff --git a/pkgs/development/compilers/flutter/engine/package.nix b/pkgs/development/compilers/flutter/engine/package.nix index d9b20898886c..b4ac8c9828d9 100644 --- a/pkgs/development/compilers/flutter/engine/package.nix +++ b/pkgs/development/compilers/flutter/engine/package.nix @@ -3,12 +3,10 @@ callPackage, writeText, symlinkJoin, - targetPlatform, - buildPlatform, darwin, clang, llvm, - tools ? callPackage ./tools.nix { inherit buildPlatform; }, + tools ? callPackage ./tools.nix { }, stdenv, stdenvNoCC, dart, @@ -53,7 +51,7 @@ let expandDeps = deps: lib.flatten (map expandSingleDep deps); - constants = callPackage ./constants.nix { platform = targetPlatform; }; + constants = callPackage ./constants.nix { platform = stdenv.targetPlatform; }; python3 = if lib.versionAtLeast flutterVersion "3.20" then python312 else python39; @@ -64,8 +62,6 @@ let version hashes url - targetPlatform - buildPlatform ; }; @@ -253,7 +249,7 @@ stdenv.mkDerivation (finalAttrs: { "--embedder-for-target" "--no-goma" ] - ++ lib.optionals (targetPlatform.isx86_64 == false) [ + ++ lib.optionals (stdenv.targetPlatform.isx86_64 == false) [ "--linux" "--linux-cpu ${constants.alt-arch}" ] @@ -278,7 +274,7 @@ stdenv.mkDerivation (finalAttrs: { --out-dir $out \ --target-sysroot $toolchain \ --target-dir $outName \ - --target-triple ${targetPlatform.config} \ + --target-triple ${stdenv.targetPlatform.config} \ --enable-fontconfig runHook postConfigure diff --git a/pkgs/development/compilers/flutter/engine/source.nix b/pkgs/development/compilers/flutter/engine/source.nix index 426e4db4e664..b6cc9683e78d 100644 --- a/pkgs/development/compilers/flutter/engine/source.nix +++ b/pkgs/development/compilers/flutter/engine/source.nix @@ -1,9 +1,7 @@ { + stdenv, lib, callPackage, - buildPlatform, - targetPlatform, - hostPlatform, fetchgit, tools ? null, curl, @@ -19,13 +17,14 @@ url, }@pkgs: let - target-constants = callPackage ./constants.nix { platform = targetPlatform; }; - build-constants = callPackage ./constants.nix { platform = buildPlatform; }; - tools = pkgs.tools or (callPackage ./tools.nix { inherit hostPlatform buildPlatform; }); + target-constants = callPackage ./constants.nix { platform = stdenv.targetPlatform; }; + build-constants = callPackage ./constants.nix { platform = stdenv.buildPlatform; }; + tools = pkgs.tools or (callPackage ./tools.nix { }); boolOption = value: if value then "True" else "False"; in -runCommand "flutter-engine-source-${version}-${buildPlatform.system}-${targetPlatform.system}" +runCommand + "flutter-engine-source-${version}-${stdenv.buildPlatform.system}-${stdenv.targetPlatform.system}" { pname = "flutter-engine-source"; inherit version; @@ -53,7 +52,7 @@ runCommand "flutter-engine-source-${version}-${buildPlatform.system}-${targetPla "custom_vars": { "download_fuchsia_deps": False, "download_android_deps": False, - "download_linux_deps": ${boolOption targetPlatform.isLinux}, + "download_linux_deps": ${boolOption stdenv.targetPlatform.isLinux}, "setup_githooks": False, "download_esbuild": False, "download_dart_sdk": False, @@ -83,8 +82,8 @@ runCommand "flutter-engine-source-${version}-${buildPlatform.system}-${targetPla outputHashAlgo = "sha256"; outputHashMode = "recursive"; outputHash = - (hashes."${buildPlatform.system}" or { })."${targetPlatform.system}" - or (throw "Hash not set for ${targetPlatform.system} on ${buildPlatform.system}"); + (hashes."${stdenv.buildPlatform.system}" or { })."${stdenv.targetPlatform.system}" + or (throw "Hash not set for ${stdenv.targetPlatform.system} on ${stdenv.buildPlatform.system}"); } '' source ${../../../../build-support/fetchgit/deterministic-git} diff --git a/pkgs/development/compilers/flutter/engine/tools.nix b/pkgs/development/compilers/flutter/engine/tools.nix index 42cfd5e6dca6..dbe0b4bcf157 100644 --- a/pkgs/development/compilers/flutter/engine/tools.nix +++ b/pkgs/development/compilers/flutter/engine/tools.nix @@ -5,8 +5,6 @@ fetchurl, writeText, runCommand, - buildPlatform, - hostPlatform, darwin, writeShellScriptBin, depot_toolsCommit ? "7d95eb2eb054447592585c73a8ff7adad97ecba1", @@ -31,8 +29,8 @@ }, }: let - constants = callPackage ./constants.nix { platform = buildPlatform; }; - host-constants = callPackage ./constants.nix { platform = hostPlatform; }; + constants = callPackage ./constants.nix { platform = stdenv.buildPlatform; }; + host-constants = callPackage ./constants.nix { platform = stdenv.hostPlatform; }; stdenv-constants = callPackage ./constants.nix { platform = stdenv.hostPlatform; }; in { diff --git a/pkgs/development/compilers/zig/cc.nix b/pkgs/development/compilers/zig/cc.nix index dc94e918814d..115a71ca4900 100644 --- a/pkgs/development/compilers/zig/cc.nix +++ b/pkgs/development/compilers/zig/cc.nix @@ -3,7 +3,7 @@ wrapCCWith, makeWrapper, runCommand, - targetPlatform, + stdenv, targetPackages, zig, }: @@ -34,9 +34,9 @@ wrapCCWith { nixSupport.cc-cflags = [ "-target" - "${targetPlatform.parsed.cpu.name}-${targetPlatform.parsed.kernel.name}-${targetPlatform.parsed.abi.name}" + "${stdenv.targetPlatform.parsed.cpu.name}-${stdenv.targetPlatform.parsed.kernel.name}-${stdenv.targetPlatform.parsed.abi.name}" ] ++ lib.optional ( - targetPlatform.isLinux && !(targetPackages.isStatic or false) + stdenv.targetPlatform.isLinux && !(targetPackages.isStatic or false) ) "-Wl,-dynamic-linker=${targetPackages.stdenv.cc.bintools.dynamicLinker}"; } diff --git a/pkgs/development/python-modules/conda/default.nix b/pkgs/development/python-modules/conda/default.nix index a02e75987d76..523110cf03ab 100644 --- a/pkgs/development/python-modules/conda/default.nix +++ b/pkgs/development/python-modules/conda/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - hostPlatform, + stdenv, fetchFromGitHub, # build dependencies hatchling, @@ -72,7 +72,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "conda" ]; # menuinst is currently not packaged - pythonRemoveDeps = lib.optionals (!hostPlatform.isWindows) [ "menuinst" ]; + pythonRemoveDeps = lib.optionals (!stdenv.hostPlatform.isWindows) [ "menuinst" ]; meta = { description = "OS-agnostic, system-level binary package manager"; diff --git a/pkgs/tools/networking/rosenpass/default.nix b/pkgs/tools/networking/rosenpass/default.nix index 476514d7b826..254a6b3aa8e8 100644 --- a/pkgs/tools/networking/rosenpass/default.nix +++ b/pkgs/tools/networking/rosenpass/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nixosTests , rustPlatform -, hostPlatform +, stdenv , installShellFiles , cmake , libsodium @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { # nix defaults to building for aarch64 _without_ the armv8-a # crypto extensions, but liboqs depends on these - preBuild = lib.optionalString hostPlatform.isAarch64 '' + preBuild = lib.optionalString stdenv.hostPlatform.isAarch64 '' NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -march=armv8-a+crypto" ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76d7a62e6b8d..eba4c0b7f4c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25962,9 +25962,11 @@ with pkgs; fetchurl = import ../build-support/fetchurl/boot.nix { inherit (stdenv.buildPlatform) system; }; - checkMeta = callPackage ../stdenv/generic/check-meta.nix { }; + checkMeta = callPackage ../stdenv/generic/check-meta.nix { inherit (stdenv) hostPlatform; }; }); - minimal-bootstrap-sources = callPackage ../os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix { }; + minimal-bootstrap-sources = callPackage ../os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix { + inherit (stdenv) hostPlatform; + }; make-minimal-bootstrap-sources = callPackage ../os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix { inherit (stdenv) hostPlatform; }; diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index c477d797795a..66e624985dc4 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -119,7 +119,6 @@ let pkgsTargetTarget buildPackages pkgs targetPackages ; - inherit (pkgs.stdenv) buildPlatform targetPlatform hostPlatform; }; splicedPackagesWithXorg = splicedPackages // builtins.removeAttrs splicedPackages.xorg [