colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: s_targetPlatform_hostPlatform_ in non-compiler packages 

stdenv.targetPlatform really shouldn't be used by software that
doesn't generate or manipulate binaries.  I reviewed all uses of
targetPlatform outside of pkgs/development/compilers and pkgs/stdenv
and replaced those which weren't involved in something which fits
these criteria.
This commit is contained in:
Adam Joseph 2023-11-13 06:47:08 -08:00 committed by Adam Joseph
parent 6a689e72ef
commit c7e0f6b905
69 changed files with 94 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/aucatctl/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: {
};
buildInputs = [ sndio ]
++ lib.optional (!stdenv.isDarwin && !stdenv.targetPlatform.isBSD)
++ lib.optional (!stdenv.isDarwin && !stdenv.hostPlatform.isBSD)
libbsd;
outputs = [ "out" "man" ];
@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
preBuild = ''
makeFlagsArray+=("PREFIX=$out")
'' + lib.optionalString
(!stdenv.isDarwin && !stdenv.targetPlatform.isBSD) ''
(!stdenv.isDarwin && !stdenv.hostPlatform.isBSD) ''
makeFlagsArray+=(LDADD="-lsndio -lbsd")
# Fix warning about implicit declaration of function 'strlcpy'

2
pkgs/applications/audio/audacity/default.nix
View File

@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
'' + lib.optionalString stdenv.isLinux ''
substituteInPlace libraries/lib-files/FileNames.cpp \
--replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h
'' + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinMinVersion "11.0") ''
'' + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11.0") ''
sed -z -i "s/NSAppearanceName.*systemAppearance//" src/AudacityApp.mm
'';

2
pkgs/applications/backup/proxmox-backup-client/default.nix
View File

@ -88,7 +88,7 @@ rustPlatform.buildRustPackage {
postBuild = ''
make -C docs \
DEB_VERSION=${version} DEB_VERSION_UPSTREAM=${version} \
RUSTC_TARGET=${stdenv.targetPlatform.config} \
RUSTC_TARGET=${stdenv.hostPlatform.config} \
BUILD_MODE=release \
proxmox-backup-client.1 pxar.1
'';

2
pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix
View File

@ -65,7 +65,7 @@ self: let
});
xeft = super.xeft.overrideAttrs (old: let
libExt = pkgs.stdenv.targetPlatform.extensions.sharedLibrary;
libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary;
in {
dontUnpack = false;

4
pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
View File

@ -118,7 +118,7 @@ self: let
});
jinx = super.jinx.overrideAttrs (old: let
libExt = pkgs.stdenv.targetPlatform.extensions.sharedLibrary;
libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary;
in {
dontUnpack = false;
@ -159,7 +159,7 @@ self: let
);
xeft = super.xeft.overrideAttrs (old: let
libExt = pkgs.stdenv.targetPlatform.extensions.sharedLibrary;
libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary;
in {
dontUnpack = false;

2
pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
View File

@ -315,7 +315,7 @@ let
ivy-rtags = fix-rtags super.ivy-rtags;
jinx = super.jinx.overrideAttrs (old: let
libExt = pkgs.stdenv.targetPlatform.extensions.sharedLibrary;
libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary;
in {
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
pkgs.pkg-config

2
pkgs/applications/misc/synergy/default.nix
View File

@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
cmakeFlags = lib.optional (!withGUI) "-DSYNERGY_BUILD_LEGACY_GUI=OFF"
# NSFilenamesPboardType is deprecated in 10.14+
++ lib.optional stdenv.isDarwin "-DCMAKE_OSX_DEPLOYMENT_TARGET=${if stdenv.isAarch64 then "10.13" else stdenv.targetPlatform.darwinSdkVersion}";
++ lib.optional stdenv.isDarwin "-DCMAKE_OSX_DEPLOYMENT_TARGET=${if stdenv.isAarch64 then "10.13" else stdenv.hostPlatform.darwinSdkVersion}";
doCheck = true;

2
pkgs/applications/networking/mullvad/mullvad.nix
View File

@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec {
# talpid-core wants libwg.a in build/lib/{triple}
preBuild = ''
dest=build/lib/${stdenv.targetPlatform.config}
dest=build/lib/${stdenv.hostPlatform.config}
mkdir -p $dest
ln -s ${libwg}/lib/libwg.a $dest
'';

2
pkgs/applications/radio/uhd/default.nix
View File

@ -141,7 +141,7 @@ stdenv.mkDerivation (finalAttrs: {
];
postPhases = [ "installFirmware" "removeInstalledTests" ]
++ optionals (enableUtils && stdenv.targetPlatform.isLinux) [ "moveUdevRules" ]
++ optionals (enableUtils && stdenv.hostPlatform.isLinux) [ "moveUdevRules" ]
;
# UHD expects images in `$CMAKE_INSTALL_PREFIX/share/uhd/images`

2
pkgs/applications/science/biology/flywheel-cli/default.nix
View File

@ -5,7 +5,7 @@
}:
let
inherit (stdenv.targetPlatform) system;
inherit (stdenv.hostPlatform) system;
throwSystem = throw "Unsupported system: ${system}";
os = {

2
pkgs/applications/video/davinci-resolve/default.nix
View File

@ -62,7 +62,7 @@ let
SITEURL = "https://www.blackmagicdesign.com/api/register/us/download/${DOWNLOADID}";
USERAGENT = builtins.concatStringsSep " " [
"User-Agent: Mozilla/5.0 (X11; Linux ${stdenv.targetPlatform.linuxArch})"
"User-Agent: Mozilla/5.0 (X11; Linux ${stdenv.hostPlatform.linuxArch})"
"AppleWebKit/537.36 (KHTML, like Gecko)"
"Chrome/77.0.3865.75"
"Safari/537.36"

3
pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix
View File

@ -1,14 +1,13 @@
{ lib
, fetchFromGitHub
, hostPlatform
, targetPlatform
, cargo
, rustc
, lld
}:
let
arch = targetPlatform.qemuArch;
arch = hostPlatform.qemuArch;
target = ./. + "/${arch}-unknown-none.json";

2
pkgs/by-name/bm/bmake/package.nix
View File

@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = with lib.maintainers; [ thoughtpolice AndersonTorres ];
platforms = lib.platforms.unix;
# ofborg: x86_64-linux builds the musl package, aarch64-linux doesn't
broken = stdenv.targetPlatform.isMusl && stdenv.buildPlatform.isAarch64;
broken = stdenv.hostPlatform.isMusl && stdenv.buildPlatform.isAarch64;
};
})
# TODO: report the quirks and patches to bmake devteam (especially the Musl one)

2
pkgs/by-name/me/mermaid-cli/package.nix
View File

@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
cp -r . "$out/lib/node_modules/@mermaid-js/mermaid-cli"
makeWrapper "${nodejs}/bin/node" "$out/bin/mmdc" \
'' + lib.optionalString (lib.meta.availableOn stdenv.targetPlatform chromium) ''
'' + lib.optionalString (lib.meta.availableOn stdenv.hostPlatform chromium) ''
--set PUPPETEER_EXECUTABLE_PATH '${lib.getExe chromium}' \
'' + ''
--add-flags "$out/lib/node_modules/@mermaid-js/mermaid-cli/src/cli.js"

2
pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix
View File

@ -33,7 +33,7 @@ buildGoPackage rec {
buildPhase = ''
runHook preBuild
addToSearchPath GOPATH "${go-lib}/share/gocode"
make ARCH=${stdenv.targetPlatform.linuxArch} -C go/src/${goPackagePath}
make ARCH=${stdenv.hostPlatform.linuxArch} -C go/src/${goPackagePath}
runHook postBuild
'';

2
pkgs/development/interpreters/acl2/libipasirglucose4/default.nix
View File

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
# that as the version number, I guess.
version = "2017";
libname = pname + stdenv.targetPlatform.extensions.sharedLibrary;
libname = pname + stdenv.hostPlatform.extensions.sharedLibrary;
src = fetchurl {
url = "https://baldur.iti.kit.edu/sat-competition-2017/solvers/incremental/glucose-ipasir.zip";

2
pkgs/development/interpreters/tinyscheme/default.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
# We want to have the makefile pick up $CC, etc. so that we don't have
# to unnecessarily tie this package to the GCC stdenv.
./02-use-toolchain-env-vars.patch
] ++ lib.optionals stdenv.targetPlatform.isDarwin [
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
# On macOS the library suffix is .dylib:
./03-macOS-SOsuf.patch
];

4
pkgs/development/libraries/SDL2/default.nix
View File

@ -9,7 +9,7 @@
, libGL
, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid
, alsa-lib
, x11Support ? !stdenv.targetPlatform.isWindows && !stdenv.hostPlatform.isAndroid
, x11Support ? !stdenv.hostPlatform.isWindows && !stdenv.hostPlatform.isAndroid
, libX11
, xorgproto
, libICE
@ -122,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: {
"--disable-oss"
] ++ lib.optional (!x11Support) "--without-x"
++ lib.optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib"
++ lib.optional stdenv.targetPlatform.isWindows "--disable-video-opengles"
++ lib.optional stdenv.hostPlatform.isWindows "--disable-video-opengles"
++ lib.optional stdenv.isDarwin "--disable-sdltest";
# We remove libtool .la files when static libs are requested,

2
pkgs/development/libraries/audio/zita-resampler/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
cd source
substituteInPlace Makefile \
--replace 'ldconfig' ""
'' + lib.optionalString (!stdenv.targetPlatform.isx86_64) ''
'' + lib.optionalString (!stdenv.hostPlatform.isx86_64) ''
substituteInPlace Makefile \
--replace '-DENABLE_SSE2' ""
'';

4
pkgs/development/libraries/blst/default.nix
View File

@ -14,8 +14,8 @@ stdenv.mkDerivation ( finalAttrs: {
buildPhase = ''
runHook preBuild
./build.sh ${lib.optionalString stdenv.targetPlatform.isWindows "flavour=mingw64"}
./build.sh -shared ${lib.optionalString stdenv.targetPlatform.isWindows "flavour=mingw64"}
./build.sh ${lib.optionalString stdenv.hostPlatform.isWindows "flavour=mingw64"}
./build.sh -shared ${lib.optionalString stdenv.hostPlatform.isWindows "flavour=mingw64"}
runHook postBuild
'';

4
pkgs/development/libraries/cctz/default.nix
View File

@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
buildInputs = lib.optional stdenv.isDarwin Foundation;
installTargets = [ "install_hdrs" ]
++ lib.optional (!stdenv.targetPlatform.isStatic) "install_shared_lib"
++ lib.optional stdenv.targetPlatform.isStatic "install_lib";
++ lib.optional (!stdenv.hostPlatform.isStatic) "install_shared_lib"
++ lib.optional stdenv.hostPlatform.isStatic "install_lib";
postInstall = lib.optionalString stdenv.isDarwin ''
install_name_tool -id $out/lib/libcctz.so $out/lib/libcctz.so

6
pkgs/development/libraries/ffmpeg/generic.nix
View File

@ -52,7 +52,7 @@
, withLadspa ? withFullDeps # LADSPA audio filtering
, withLibplacebo ? withFullDeps && !stdenv.isDarwin # libplacebo video processing library
, withLzma ? withHeadlessDeps # xz-utils
, withMfx ? withFullDeps && (with stdenv.targetPlatform; isLinux && !isAarch) # Hardware acceleration via intel-media-sdk/libmfx
, withMfx ? withFullDeps && (with stdenv.hostPlatform; isLinux && !isAarch) # Hardware acceleration via intel-media-sdk/libmfx
, withModplug ? withFullDeps && !stdenv.isDarwin # ModPlug support
, withMp3lame ? withHeadlessDeps # LAME MP3 encoder
, withMysofa ? withFullDeps # HRTF support via SOFAlizer
@ -386,8 +386,8 @@ stdenv.mkDerivation (finalAttrs: {
(enableFeature withHardcodedTables "hardcoded-tables")
(enableFeature withSafeBitstreamReader "safe-bitstream-reader")
(enableFeature (withMultithread && stdenv.targetPlatform.isUnix) "pthreads")
(enableFeature (withMultithread && stdenv.targetPlatform.isWindows) "w32threads")
(enableFeature (withMultithread && stdenv.hostPlatform.isUnix) "pthreads")
(enableFeature (withMultithread && stdenv.hostPlatform.isWindows) "w32threads")
"--disable-os2threads" # We don't support OS/2
(enableFeature withNetwork "network")

2
pkgs/development/libraries/libcef/default.nix
View File

@ -69,7 +69,7 @@ let
platforms."aarch64-linux".sha256 = "12sp58nxa3nv800badv62vpvc30hyb0ykywdaxgv9y8pswp9lq0z";
platforms."x86_64-linux".sha256 = "0vzzwq1k6bv9d209yg3samvfnfwj7s58y9r3p3pd98wxa9iyzf4j";
platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms;
platformInfo = builtins.getAttr stdenv.hostPlatform.system platforms;
in
stdenv.mkDerivation rec {
pname = "cef-binary";

8
pkgs/development/libraries/libsodium/default.nix
View File

@ -13,18 +13,18 @@ stdenv.mkDerivation (finalAttrs: {
outputs = [ "out" "dev" ];
patches = lib.optional stdenv.targetPlatform.isMinGW ./mingw-no-fortify.patch;
patches = lib.optional stdenv.hostPlatform.isMinGW ./mingw-no-fortify.patch;
nativeBuildInputs = lib.optional stdenv.targetPlatform.isMinGW autoreconfHook;
nativeBuildInputs = lib.optional stdenv.hostPlatform.isMinGW autoreconfHook;
separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl";
enableParallelBuilding = true;
hardeningDisable = lib.optional (stdenv.targetPlatform.isMusl && stdenv.targetPlatform.isx86_32) "stackprotector";
hardeningDisable = lib.optional (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_32) "stackprotector";
# FIXME: the hardeingDisable attr above does not seems effective, so
# the need to disable stackprotector via configureFlags
configureFlags = lib.optional (stdenv.targetPlatform.isMusl && stdenv.targetPlatform.isx86_32) "--disable-ssp";
configureFlags = lib.optional (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_32) "--disable-ssp";
doCheck = true;

2
pkgs/development/libraries/libusb1/default.nix
View File

@ -4,7 +4,7 @@
, fetchpatch
, autoreconfHook
, pkg-config
, enableUdev ? stdenv.isLinux && !stdenv.targetPlatform.isStatic
, enableUdev ? stdenv.isLinux && !stdenv.hostPlatform.isStatic
, udev
, libobjc
, IOKit

2
pkgs/development/libraries/mtxclient/default.nix
View File

@ -61,6 +61,6 @@ stdenv.mkDerivation rec {
platforms = platforms.all;
# Should be fixable if a higher clang version is used, see:
# https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177
broken = stdenv.targetPlatform.isDarwin;
broken = stdenv.hostPlatform.isDarwin;
};
}

2
pkgs/development/libraries/multipart-parser-c/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/lib
mv lib*${stdenv.targetPlatform.extensions.sharedLibrary} $out/lib/
mv lib*${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/
mkdir -p $out/include
mv *.h $out/include/

2
pkgs/development/libraries/ntl/default.nix
View File

@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
"TUNE=${
if tune then
"auto"
else if stdenv.targetPlatform.isx86 then
else if stdenv.hostPlatform.isx86 then
"x86" # "chooses options that should be well suited for most x86 platforms"
else
"generic" # "chooses options that should be OK for most platforms"

4
pkgs/development/libraries/protobuf/generic.nix
View File

@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
]
# Tests fail to build on 32-bit platforms; fixed in 22.x
# https://github.com/protocolbuffers/protobuf/issues/10418
++ lib.optionals (stdenv.targetPlatform.is32bit && lib.versionOlder version "22") [
++ lib.optionals (stdenv.hostPlatform.is32bit && lib.versionOlder version "22") [
"-Dprotobuf_BUILD_TESTS=OFF"
];
@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
# https://hydra.nixos.org/build/235677717/nixlog/4/tail
# Also AnyTest.TestPackFromSerializationExceedsSizeLimit fails on 32-bit platforms
# https://github.com/protocolbuffers/protobuf/issues/8460
doCheck = !(stdenv.isDarwin && lib.versionAtLeast version "23") && !stdenv.targetPlatform.is32bit;
doCheck = !(stdenv.isDarwin && lib.versionAtLeast version "23") && !stdenv.hostPlatform.is32bit;
passthru = {
tests = {

3
pkgs/development/libraries/relibc/default.nix
View File

@ -63,8 +63,7 @@ redoxRustPlatform.buildRustPackage rec {
DESTDIR=$out make install
'';
# TODO: should be hostPlatform
TARGET = stdenvNoCC.targetPlatform.rust.rustcTargetSpec;
TARGET = stdenvNoCC.hostPlatform.rust.rustcTargetSpec;
cargoLock = {
lockFile = ./Cargo.lock;

2
pkgs/development/libraries/science/math/libtorch/bin.nix
View File

@ -26,7 +26,7 @@ in stdenv.mkDerivation {
inherit version;
pname = "libtorch";
src = fetchzip srcs."${stdenv.targetPlatform.system}-${device}" or unavailable;
src = fetchzip srcs."${stdenv.hostPlatform.system}-${device}" or unavailable;
nativeBuildInputs =
if stdenv.isDarwin then [ fixDarwinDylibNames ]

2
pkgs/development/libraries/science/math/zn_poly/default.nix
View File

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
# name of library file ("libzn_poly.so")
libbasename = "libzn_poly";
libext = stdenv.targetPlatform.extensions.sharedLibrary;
libext = stdenv.hostPlatform.extensions.sharedLibrary;
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];

2
pkgs/development/libraries/startup-notification/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a";
};
configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.targetPlatform) [
configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
"lf_cv_sane_realloc=yes"
];

2
pkgs/development/libraries/tk/generic.nix
View File

@ -22,7 +22,7 @@ tcl.mkTclDerivation {
substituteInPlace $file --replace "exec wish" "exec $out/bin/wish"
done
''
+ lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinMinVersion "11") ''
+ lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") ''
substituteInPlace unix/configure* \
--replace " -framework UniformTypeIdentifiers" ""
'';

2
pkgs/development/libraries/v8/default.nix
View File

@ -136,7 +136,7 @@ stdenv.mkDerivation rec {
++ lib.optional stdenv.isDarwin ''use_lld=false'';
env.NIX_CFLAGS_COMPILE = "-O2";
FORCE_MAC_SDK_MIN = stdenv.targetPlatform.sdkVer or "10.12";
FORCE_MAC_SDK_MIN = stdenv.hostPlatform.sdkVer or "10.12";
nativeBuildInputs = [
myGn

2
pkgs/development/libraries/vapoursynth/plugin-interface.nix
View File

@ -36,7 +36,7 @@ plugins: let
$CC -shared -fPIC ${source} -o "$out/lib/libvapoursynth-nix-plugins${ext}"
'';
ext = stdenv.targetPlatform.extensions.sharedLibrary;
ext = stdenv.hostPlatform.extensions.sharedLibrary;
in
runCommand "${vapoursynth.name}-with-plugins" {
nativeBuildInputs = [ makeWrapper ];

2
pkgs/development/libraries/wayland/protocols.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
version = "1.32";
# https://gitlab.freedesktop.org/wayland/wayland-protocols/-/issues/48
doCheck = stdenv.hostPlatform == stdenv.buildPlatform && stdenv.targetPlatform.linker == "bfd" && wayland.withLibraries;
doCheck = stdenv.hostPlatform == stdenv.buildPlatform && stdenv.hostPlatform.linker == "bfd" && wayland.withLibraries;
src = fetchurl {
url = "https://gitlab.freedesktop.org/wayland/${pname}/-/releases/${version}/downloads/${pname}-${version}.tar.xz";

2
pkgs/development/python-modules/distlib/default.nix
View File

@ -19,7 +19,7 @@ buildPythonPackage rec {
setuptools
];
postFixup = lib.optionalString (!stdenv.targetPlatform.isWindows) ''
postFixup = lib.optionalString (!stdenv.hostPlatform.isWindows) ''
find $out -name '*.exe' -delete
'';

10
pkgs/development/python-modules/jaxlib/default.nix
View File

@ -136,8 +136,8 @@ let
arch =
# KeyError: ('Linux', 'arm64')
if stdenv.targetPlatform.isLinux && stdenv.targetPlatform.linuxArch == "arm64" then "aarch64"
else stdenv.targetPlatform.linuxArch;
if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.linuxArch == "arm64" then "aarch64"
else stdenv.hostPlatform.linuxArch;
bazel-build = buildBazelPackage rec {
name = "bazel-build-${pname}-${version}";
@ -219,7 +219,7 @@ let
build --python_path="${python}/bin/python"
build --distinct_host_configuration=false
build --define PROTOBUF_INCLUDE_PATH="${pkgs.protobuf}/include"
'' + lib.optionalString (stdenv.targetPlatform.avxSupport && stdenv.targetPlatform.isUnix) ''
'' + lib.optionalString (stdenv.hostPlatform.avxSupport && stdenv.hostPlatform.isUnix) ''
build --config=avx_posix
'' + lib.optionalString mklSupport ''
build --config=mkl_open_source_only
@ -298,13 +298,13 @@ let
inherit meta;
};
platformTag =
if stdenv.targetPlatform.isLinux then
if stdenv.hostPlatform.isLinux then
"manylinux2014_${arch}"
else if stdenv.system == "x86_64-darwin" then
"macosx_10_9_${arch}"
else if stdenv.system == "aarch64-darwin" then
"macosx_11_0_${arch}"
else throw "Unsupported target platform: ${stdenv.targetPlatform}";
else throw "Unsupported target platform: ${stdenv.hostPlatform}";
in
buildPythonPackage {

2
pkgs/development/python-modules/mido/default.nix
View File

@ -23,7 +23,7 @@ buildPythonPackage rec {
patches = [
(substituteAll {
src = ./libportmidi-cdll.patch;
libportmidi = "${portmidi.out}/lib/libportmidi${stdenv.targetPlatform.extensions.sharedLibrary}";
libportmidi = "${portmidi.out}/lib/libportmidi${stdenv.hostPlatform.extensions.sharedLibrary}";
})
];

2
pkgs/development/python-modules/mpv/default.nix
View File

@ -27,7 +27,7 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace mpv.py \
--replace "sofile = ctypes.util.find_library('mpv')" \
'sofile = "${mpv}/lib/libmpv${stdenv.targetPlatform.extensions.sharedLibrary}"'
'sofile = "${mpv}/lib/libmpv${stdenv.hostPlatform.extensions.sharedLibrary}"'
'';
# tests impure, will error if it can't load libmpv.so

2
pkgs/development/python-modules/mysql-connector/default.nix
View File

@ -35,7 +35,7 @@ buildPythonPackage rec {
patches = [
# mysql-connector overrides MACOSX_DEPLOYMENT_TARGET to 11.
# This makes the installation with nixpkgs fail. I suspect, that's
# because stdenv.targetPlatform.darwinSdkVersion is (currently) set to
# because stdenv.hostPlatform.darwinSdkVersion is (currently) set to
# 10.12. The patch reverts
# https://github.com/mysql/mysql-connector-python/commit/d1e89fd3d7391084cdf35b0806cb5d2a4b413654
./0001-Revert-Fix-MacOS-wheels-platform-tag.patch

2
pkgs/development/python-modules/testpath/default.nix
View File

@ -26,7 +26,7 @@ buildPythonPackage rec {
# exe are only required when testpath is used on windows
# https://github.com/jupyter/testpath/blob/de8ca59539eb23b9781e55848b7d2646c8c61df9/testpath/commands.py#L128
preBuild = lib.optionalString (!stdenv.targetPlatform.isWindows) ''
preBuild = lib.optionalString (!stdenv.hostPlatform.isWindows) ''
rm testpath/cli-32.exe testpath/cli-64.exe
'';

2
pkgs/development/python-modules/torch/default.nix
View File

@ -189,7 +189,7 @@ in buildPythonPackage rec {
''
# error: no member named 'aligned_alloc' in the global namespace; did you mean simply 'aligned_alloc'
# This lib overrided aligned_alloc hence the error message. Tltr: his function is linkable but not in header.
+ lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0") ''
+ lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0") ''
substituteInPlace third_party/pocketfft/pocketfft_hdronly.h --replace '#if __cplusplus >= 201703L
inline void *aligned_alloc(size_t align, size_t size)' '#if __cplusplus >= 201703L && 0
inline void *aligned_alloc(size_t align, size_t size)'

2
pkgs/development/tools/azure-functions-core-tools/default.nix
View File

@ -27,7 +27,7 @@
};
};
platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms;
platformInfo = builtins.getAttr stdenv.hostPlatform.system platforms;
in
stdenv.mkDerivation rec {
pname = "azure-functions-core-tools";

2
pkgs/development/tools/azure-static-sites-client/default.nix
View File

@ -28,7 +28,7 @@ stdenv.mkDerivation {
pname = "StaticSitesClient-${versionFlavor}";
version = flavor.buildId;
src = sources.${stdenv.targetPlatform.system} or (throw "Unsupported platform");
src = sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform");
nativeBuildInputs = [
autoPatchelfHook

2
pkgs/development/tools/faas-cli/default.nix
View File

@ -37,7 +37,7 @@ buildGoModule rec {
"-s" "-w"
"-X github.com/openfaas/faas-cli/version.GitCommit=ref/tags/${version}"
"-X github.com/openfaas/faas-cli/version.Version=${version}"
"-X github.com/openfaas/faas-cli/commands.Platform=${faasPlatform stdenv.targetPlatform}"
"-X github.com/openfaas/faas-cli/commands.Platform=${faasPlatform stdenv.hostPlatform}"
];
nativeBuildInputs = [ makeWrapper installShellFiles ];

2
pkgs/games/cataclysm-dda/common.nix
View File

@ -53,7 +53,7 @@ stdenv.mkDerivation {
] ++ optionals stdenv.isDarwin [
"NATIVE=osx"
"CLANG=1"
"OSX_MIN=${stdenv.targetPlatform.darwinMinVersion}"
"OSX_MIN=${stdenv.hostPlatform.darwinMinVersion}"
];
postInstall = optionalString tiles

2
pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
View File

@ -2,7 +2,7 @@
let
platformSlug =
if stdenv.targetPlatform.is32bit then
if stdenv.hostPlatform.is32bit then
"linux32" else "linux64";
inifile = "linux/v0.${dwarf-fortress.baseVersion}.${dwarf-fortress.patchVersion}_${platformSlug}.ini";

2
pkgs/games/enigma/default.nix
View File

@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
description = "Puzzle game inspired by Oxyd on the Atari ST and Rock'n'Roll on the Amiga";
license = with licenses; [ gpl2 free ]; # source + bundles libs + art
platforms = platforms.unix;
broken = stdenv.targetPlatform.isDarwin;
broken = stdenv.hostPlatform.isDarwin;
maintainers = with maintainers; [ iblech ];
homepage = "https://www.nongnu.org/enigma/";
};

2
pkgs/misc/cups/default.nix
View File

@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
# service would stop the socket and break subsequent socket activations.
# See https://github.com/apple/cups/issues/6005
sed -i '/PartOf=cups.service/d' scheduler/cups.socket.in
'' + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "12") ''
'' + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "12") ''
substituteInPlace backend/usb-darwin.c \
--replace "kIOMainPortDefault" "kIOMasterPortDefault"
'';

6
pkgs/misc/cups/drivers/canon/default.nix
View File

@ -26,9 +26,9 @@
let
system =
if stdenv.targetPlatform.system == "x86_64-linux" then "intel"
else if stdenv.targetPlatform.system == "aarch64-linux" then "arm"
else throw "Unsupported platform for Canon UFR2 Drivers: ${stdenv.targetPlatform.system}";
if stdenv.hostPlatform.system == "x86_64-linux" then "intel"
else if stdenv.hostPlatform.system == "aarch64-linux" then "arm"
else throw "Unsupported platform for Canon UFR2 Drivers: ${stdenv.hostPlatform.system}";
ld64 = "${stdenv.cc}/nix-support/dynamic-linker";
libs = pkgs: lib.makeLibraryPath buildInputs;

4
pkgs/os-specific/darwin/moltenvk/default.nix
View File

@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: {
-configuration Release \
-project MoltenVKShaderConverter.xcodeproj \
-scheme MoltenVKShaderConverter \
-arch ${stdenv.targetPlatform.darwinArch}
-arch ${stdenv.hostPlatform.darwinArch}
declare -A products=( [MoltenVKShaderConverter]=bin [libMoltenVKShaderConverter.a]=lib )
for product in "''${!products[@]}"; do
cp MoltenVKShaderConverter-*/Build/Products/Release/$product "$build/''${products[$product]}/$product"
@ -127,7 +127,7 @@ stdenv.mkDerivation (finalAttrs: {
-configuration Release \
-project MoltenVK.xcodeproj \
-scheme MoltenVK-macOS \
-arch ${stdenv.targetPlatform.darwinArch}
-arch ${stdenv.hostPlatform.darwinArch}
cp MoltenVK-*/Build/Products/Release/dynamic/libMoltenVK.dylib "$build/lib/libMoltenVK.dylib"
popd
'';

4
pkgs/os-specific/linux/bionic-prebuilt/default.nix
View File

@ -5,7 +5,7 @@
let
choosePlatform =
let pname = stdenv.targetPlatform.parsed.cpu.name; in
let pname = stdenv.hostPlatform.parsed.cpu.name; in
pset: pset.${pname} or (throw "bionic-prebuilt: unsupported platform ${pname}");
prebuilt_crt = choosePlatform {
@ -66,7 +66,7 @@ in
stdenvNoCC.mkDerivation rec {
pname = "bionic-prebuilt";
version = "ndk-release-r23";
name = "${stdenv.targetPlatform.parsed.cpu.name}-${pname}-${version}";
name = "${stdenv.hostPlatform.parsed.cpu.name}-${pname}-${version}";
src = fetchzip {
url = "https://android.googlesource.com/platform/bionic/+archive/00e8ce1142d8823b0d2fc8a98b40119b0f1f02cd.tar.gz";

6
pkgs/os-specific/linux/criu/default.nix
View File

@ -88,9 +88,9 @@ stdenv.mkDerivation rec {
"PREFIX=$(out)"
"ASCIIDOC=${buildPackages.asciidoc}/bin/asciidoc"
"XMLTO=${buildPackages.xmlto}/bin/xmlto"
] ++ (lib.optionals (stdenv.buildPlatform != stdenv.targetPlatform) [
"ARCH=${linuxArchMapping."${stdenv.targetPlatform.linuxArch}"}"
"CROSS_COMPILE=${stdenv.targetPlatform.config}-"
] ++ (lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
"ARCH=${linuxArchMapping."${stdenv.hostPlatform.linuxArch}"}"
"CROSS_COMPILE=${stdenv.hostPlatform.config}-"
]);
outputs = [ "out" "dev" "man" ];

2
pkgs/os-specific/linux/nmon/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = [ ncurses ];
dontUnpack = true;
buildPhase = "${stdenv.cc.targetPrefix}cc -o nmon ${src} -g -O2 -D JFS -D GETUSER -Wall -D LARGEMEM -lncurses -lm -g -D ${
with stdenv.targetPlatform;
with stdenv.hostPlatform;
if isx86 then "X86"
else if isAarch then "ARM"
else if isPower then "POWER"

2
pkgs/servers/dante/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
configureFlags = if !stdenv.isDarwin
then [ "--with-libc=libc.so.6" ]
else [ "--with-libc=libc${stdenv.targetPlatform.extensions.sharedLibrary}" ];
else [ "--with-libc=libc${stdenv.hostPlatform.extensions.sharedLibrary}" ];
dontAddDisableDepTrack = stdenv.isDarwin;

2
pkgs/servers/dns/knot-resolver/default.nix
View File

@ -83,7 +83,7 @@ unwrapped = stdenv.mkDerivation rec {
postInstall = ''
rm "$out"/lib/libkres.a
rm "$out"/lib/knot-resolver/upgrade-4-to-5.lua # not meaningful on NixOS
'' + optionalString stdenv.targetPlatform.isLinux ''
'' + optionalString stdenv.hostPlatform.isLinux ''
rm -r "$out"/lib/sysusers.d/ # ATM more likely to harm than help
'';

2
pkgs/servers/matrix-synapse/matrix-hookshot/default.nix
View File

@ -59,7 +59,7 @@ mkYarnPackage rec {
buildPhase = ''
runHook preBuild
cd deps/${pname}
napi build --target ${stdenv.targetPlatform.rust.rustcTargetSpec} --dts ../src/libRs.d.ts --release ./lib
napi build --target ${stdenv.hostPlatform.rust.rustcTargetSpec} --dts ../src/libRs.d.ts --release ./lib
yarn run build:app:fix-defs
yarn run build:app
yarn run build:web

2
pkgs/servers/monitoring/grafana/plugins/grafana-plugin.nix
View File

@ -1,7 +1,7 @@
{ stdenvNoCC, fetchurl, unzip, lib }:
{ pname, version, zipHash, meta ? {}, passthru ? {}, ... }@args:
let plat = stdenvNoCC.targetPlatform.system; in stdenvNoCC.mkDerivation ({
let plat = stdenvNoCC.hostPlatform.system; in stdenvNoCC.mkDerivation ({
inherit pname version;
src = if lib.isAttrs zipHash then

2
pkgs/servers/mpd/default.nix
View File

@ -148,7 +148,7 @@ let
depsBuildBuild = [ buildPackages.stdenv.cc ];
postPatch = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "12.0") ''
postPatch = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "12.0") ''
substituteInPlace src/output/plugins/OSXOutputPlugin.cxx \
--replace kAudioObjectPropertyElement{Main,Master} \
--replace kAudioHardwareServiceDeviceProperty_Virtual{Main,Master}Volume

2
pkgs/servers/networkaudiod/default.nix
View File

@ -6,7 +6,7 @@
, alsa-lib
}:
let
inherit (stdenv.targetPlatform) system;
inherit (stdenv.hostPlatform) system;
throwSystem = throw "Unsupported system: ${system}";
in
stdenv.mkDerivation rec {

6
pkgs/servers/nosql/arangodb/default.nix
View File

@ -15,12 +15,12 @@
, lzo
, which
, targetArchitecture ? null
, asmOptimizations ? gcc10Stdenv.targetPlatform.isx86
, asmOptimizations ? gcc10Stdenv.hostPlatform.isx86
}:
let
defaultTargetArchitecture =
if gcc10Stdenv.targetPlatform.isx86
if gcc10Stdenv.hostPlatform.isx86
then "haswell"
else "core";
@ -72,7 +72,7 @@ gcc10Stdenv.mkDerivation rec {
"-DTARGET_ARCHITECTURE=${targetArch}"
] ++ lib.optionals asmOptimizations [
"-DASM_OPTIMIZATIONS=ON"
"-DHAVE_SSE42=${if gcc10Stdenv.targetPlatform.sse4_2Support then "ON" else "OFF"}"
"-DHAVE_SSE42=${if gcc10Stdenv.hostPlatform.sse4_2Support then "ON" else "OFF"}"
];
meta = with lib; {

2
pkgs/tools/compression/zfp/default.nix
View File

@ -2,7 +2,7 @@
, config
, enableCfp ? true
, enableCuda ? config.cudaSupport
, enableFortran ? builtins.elem stdenv.targetPlatform.system gfortran.meta.platforms
, enableFortran ? builtins.elem stdenv.hostPlatform.system gfortran.meta.platforms
, enableOpenMP ? true
, enablePython ? true
, enableUtilities ? true }:

4
pkgs/tools/games/pocket-updater-utility/default.nix
View File

@ -6,7 +6,7 @@
, dotnetCorePackages ? pkgs.dotnetCorePackages
, openssl ? pkgs.openssl
, zlib ? pkgs.zlib
, targetPlatform ? pkgs.targetPlatform
, hostPlatform ? stdenv.hostPlatform
}:
buildDotnetModule rec {
@ -30,7 +30,7 @@ buildDotnetModule rec {
patches = [ ./add-runtime-identifier.patch ];
postPatch = ''
substituteInPlace pocket_updater.csproj \
--replace @RuntimeIdentifier@ "${dotnetCorePackages.systemToDotnetRid targetPlatform.system}"
--replace @RuntimeIdentifier@ "${dotnetCorePackages.systemToDotnetRid hostPlatform.system}"
'';
projectFile = "pocket_updater.csproj";

2
pkgs/tools/misc/shim/default.nix
View File

@ -3,7 +3,7 @@
let
inherit (stdenv.targetPlatform) system;
inherit (stdenv.hostPlatform) system;
throwSystem = throw "Unsupported system: ${system}";
target = {

2
pkgs/tools/misc/vector/default.nix
View File

@ -27,7 +27,7 @@
# the second feature flag is passed to the rdkafka dependency
# building on linux fails without this feature flag (both x86_64 and AArch64)
++ lib.optionals enableKafka [ "rdkafka?/gssapi-vendored" ]
++ lib.optional stdenv.targetPlatform.isUnix "unix")
++ lib.optional stdenv.hostPlatform.isUnix "unix")
, nixosTests
, nix-update-script
}:

4
pkgs/tools/networking/rosenpass/default.nix
View File

@ -2,7 +2,7 @@
, fetchFromGitHub
, nixosTests
, rustPlatform
, targetPlatform
, hostPlatform
, 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 targetPlatform.isAarch64 ''
preBuild = lib.optionalString hostPlatform.isAarch64 ''
NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -march=armv8-a+crypto"
'';

2
pkgs/tools/video/blackmagic-desktop-video/default.nix
View File

@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
SITEURL = "https://www.blackmagicdesign.com/api/register/us/download/${DOWNLOADID}";
USERAGENT = builtins.concatStringsSep " " [
"User-Agent: Mozilla/5.0 (X11; Linux ${stdenv.targetPlatform.linuxArch})"
"User-Agent: Mozilla/5.0 (X11; Linux ${stdenv.hostPlatform.linuxArch})"
"AppleWebKit/537.36 (KHTML, like Gecko)"
"Chrome/77.0.3865.75"
"Safari/537.36"