From 97262ee87192c8bd8e95540a3e97e96dea1ddac8 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 4 Jun 2025 18:54:50 +0200 Subject: [PATCH] treewide: replace `stdenv.is` with `stdenv.hostPlatform.is` --- nixos/tests/mattermost/default.nix | 2 +- pkgs/by-name/ac/actual-server/package.nix | 2 +- pkgs/by-name/ag/age-plugin-se/package.nix | 2 +- pkgs/by-name/ak/akkoma-admin-fe/package.nix | 2 +- pkgs/by-name/ar/ares-rs/package.nix | 2 +- pkgs/by-name/ar/arp-scan-rs/package.nix | 2 +- pkgs/by-name/bi/bicep-lsp/package.nix | 6 +++--- pkgs/by-name/ca/camilladsp/package.nix | 2 +- pkgs/by-name/ca/cargo-bazel/package.nix | 2 +- pkgs/by-name/cl/cloud-provider-kind/package.nix | 2 +- pkgs/by-name/fl/fluent-bit/package.nix | 2 +- pkgs/by-name/gc/gcc-arm-embedded-13/package.nix | 6 +++--- pkgs/by-name/gc/gcc-arm-embedded-14/package.nix | 6 +++--- pkgs/by-name/gz/gz-cmake/package.nix | 2 +- pkgs/by-name/ht/http-scanner/package.nix | 2 +- pkgs/by-name/ja/jai/package.nix | 2 +- pkgs/by-name/li/libcdio/package.nix | 2 +- pkgs/by-name/ma/matrix-brandy/package.nix | 4 ++-- pkgs/by-name/mu/musl-obstack/package.nix | 2 +- pkgs/by-name/mu/muvm/package.nix | 4 ++-- pkgs/by-name/ne/neofetch/package.nix | 6 ++++-- pkgs/by-name/os/osu-lazer-bin/package.nix | 2 +- pkgs/by-name/ov/ovftool/package.nix | 2 +- pkgs/by-name/rp/rp/package.nix | 4 ++-- pkgs/by-name/ry/ryubing/package.nix | 2 +- pkgs/by-name/sp/spider/package.nix | 2 +- pkgs/by-name/yn/ynetd/package.nix | 2 +- pkgs/development/beam-modules/build-mix.nix | 4 ++-- pkgs/development/beam-modules/mix-release.nix | 4 ++-- pkgs/development/compilers/dotnet/packages.nix | 11 +++++++---- .../compilers/elm/packages/node/node-composition.nix | 2 +- .../libraries/qt-6/modules/qtdeclarative/default.nix | 2 +- pkgs/development/lisp-modules/imported.nix | 4 ++-- pkgs/development/mobile/androidenv/build-tools.nix | 2 +- pkgs/development/php-packages/tideways/default.nix | 2 +- .../python-modules/cut-cross-entropy/default.nix | 2 +- pkgs/development/python-modules/fmpy/default.nix | 2 +- pkgs/development/python-modules/peft/default.nix | 2 +- .../prometheus-fastapi-instrumentator/default.nix | 2 +- pkgs/development/python-modules/pygal/default.nix | 2 +- .../development/python-modules/smolagents/default.nix | 2 +- pkgs/development/python-modules/vllm/default.nix | 2 +- pkgs/servers/nextcloud/packages/apps/recognize.nix | 2 +- pkgs/tools/system/uefitool/new-engine.nix | 2 +- 44 files changed, 65 insertions(+), 60 deletions(-) diff --git a/nixos/tests/mattermost/default.nix b/nixos/tests/mattermost/default.nix index 4cb9845df880..b3588c51c7a7 100644 --- a/nixos/tests/mattermost/default.nix +++ b/nixos/tests/mattermost/default.nix @@ -569,7 +569,7 @@ import ../make-test-python.nix ( shutdown_queue.task_done() threading.Thread(target=shutdown_worker, daemon=True).start() - ${pkgs.lib.optionalString pkgs.stdenv.isx86_64 '' + ${pkgs.lib.optionalString pkgs.stdenv.hostPlatform.isx86_64 '' # Only run the MySQL tests on x86_64 so we don't have to debug MySQL ARM issues. run_mattermost_tests( shutdown_queue, diff --git a/pkgs/by-name/ac/actual-server/package.nix b/pkgs/by-name/ac/actual-server/package.nix index 51a33635dbff..55ab234532fa 100644 --- a/pkgs/by-name/ac/actual-server/package.nix +++ b/pkgs/by-name/ac/actual-server/package.nix @@ -208,7 +208,7 @@ stdenv.mkDerivation { mainProgram = "actual-server"; license = lib.licenses.mit; # https://github.com/NixOS/nixpkgs/issues/403846 - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = [ lib.maintainers.oddlama lib.maintainers.patrickdag diff --git a/pkgs/by-name/ag/age-plugin-se/package.nix b/pkgs/by-name/ag/age-plugin-se/package.nix index 49f485ee2b64..b1b27481805d 100644 --- a/pkgs/by-name/ag/age-plugin-se/package.nix +++ b/pkgs/by-name/ag/age-plugin-se/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # Can't find libdispatch without this on NixOS. (swift 5.8) - LD_LIBRARY_PATH = lib.optionalString stdenv.isLinux "${swiftPackages.Dispatch}/lib"; + LD_LIBRARY_PATH = lib.optionalString stdenv.hostPlatform.isLinux "${swiftPackages.Dispatch}/lib"; postPatch = let diff --git a/pkgs/by-name/ak/akkoma-admin-fe/package.nix b/pkgs/by-name/ak/akkoma-admin-fe/package.nix index e4b47dd374e9..5560eefa7f8b 100644 --- a/pkgs/by-name/ak/akkoma-admin-fe/package.nix +++ b/pkgs/by-name/ak/akkoma-admin-fe/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { python3 git libsass - ] ++ lib.optional stdenv.isDarwin xcbuild; + ] ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild; configurePhase = '' runHook preConfigure diff --git a/pkgs/by-name/ar/ares-rs/package.nix b/pkgs/by-name/ar/ares-rs/package.nix index 4e7ba2a2b08e..54fb178582b6 100644 --- a/pkgs/by-name/ar/ares-rs/package.nix +++ b/pkgs/by-name/ar/ares-rs/package.nix @@ -37,6 +37,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ fab ]; mainProgram = "ares"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/ar/arp-scan-rs/package.nix b/pkgs/by-name/ar/arp-scan-rs/package.nix index adaa18ee35e6..99dff3f52957 100644 --- a/pkgs/by-name/ar/arp-scan-rs/package.nix +++ b/pkgs/by-name/ar/arp-scan-rs/package.nix @@ -45,6 +45,6 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "arp-scan"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/bi/bicep-lsp/package.nix b/pkgs/by-name/bi/bicep-lsp/package.nix index 9fdb1381dc86..3f8172b0fe4a 100644 --- a/pkgs/by-name/bi/bicep-lsp/package.nix +++ b/pkgs/by-name/bi/bicep-lsp/package.nix @@ -34,16 +34,16 @@ buildDotnetModule rec { dotnet-sdk = dotnetCorePackages.sdk_8_0; dotnet-runtime = dotnetCorePackages.runtime_8_0; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ icu libkrb5 openssl stdenv.cc.cc.lib ]; - doCheck = !(stdenv.isDarwin && stdenv.isAarch64); # mono is not available on aarch64-darwin + doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); # mono is not available on aarch64-darwin meta = { description = "Domain Specific Language (DSL) for deploying Azure resources declaratively"; diff --git a/pkgs/by-name/ca/camilladsp/package.nix b/pkgs/by-name/ca/camilladsp/package.nix index 33995fcba6f8..753bae7f1c39 100644 --- a/pkgs/by-name/ca/camilladsp/package.nix +++ b/pkgs/by-name/ca/camilladsp/package.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ libpulseaudio openssl - ] ++ lib.optionals stdenv.isLinux [ alsa-lib ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ]; passthru.updateScript = nix-update-script { extraArgs = [ "--generate-lockfile" ]; }; diff --git a/pkgs/by-name/ca/cargo-bazel/package.nix b/pkgs/by-name/ca/cargo-bazel/package.nix index 9816cd19f6fc..8a93a9e88489 100644 --- a/pkgs/by-name/ca/cargo-bazel/package.nix +++ b/pkgs/by-name/ca/cargo-bazel/package.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-FS1WFlK0YNq1QCi3S3f5tMN+Bdcfx2dxhDKRLXLcios="; }; - buildInputs = lib.optional stdenv.isDarwin libz; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libz; useFetchCargoVendor = true; cargoHash = "sha256-E/yF42Vx9tv8Ik1j23El3+fI19ZGzq6nikVMATY7m3E="; diff --git a/pkgs/by-name/cl/cloud-provider-kind/package.nix b/pkgs/by-name/cl/cloud-provider-kind/package.nix index 6f9842e4153f..446dadb03a55 100644 --- a/pkgs/by-name/cl/cloud-provider-kind/package.nix +++ b/pkgs/by-name/cl/cloud-provider-kind/package.nix @@ -19,7 +19,7 @@ buildGoModule rec { vendorHash = null; - checkFlags = lib.optional stdenv.isDarwin "-skip=^Test_firstSuccessfulProbe$"; + checkFlags = lib.optional stdenv.hostPlatform.isDarwin "-skip=^Test_firstSuccessfulProbe$"; meta = { description = "Load Balancer implementation for Kubernetes-in-Docker"; diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix index 796fd3d9ef78..829d03a6f055 100644 --- a/pkgs/by-name/fl/fluent-bit/package.nix +++ b/pkgs/by-name/fl/fluent-bit/package.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: { versionCheckProgramArg = "--version"; passthru = { - tests = lib.optionalAttrs stdenv.isLinux { + tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit (nixosTests) fluent-bit; }; diff --git a/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix index f955b0ed54a1..7cca0d7ed5d5 100644 --- a/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix +++ b/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ./info-fix.patch ]; - nativeBuildInputs = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ makeBinaryWrapper darwin.sigtool ]; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ''; preFixup = - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' find $out -type f | while read f; do patchelf "$f" > /dev/null 2>&1 || continue patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { } "$f" || true done '' - + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' find "$out" -executable -type f | while read executable; do ( \ install_name_tool \ diff --git a/pkgs/by-name/gc/gcc-arm-embedded-14/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-14/package.nix index 960225011253..253705829c2e 100644 --- a/pkgs/by-name/gc/gcc-arm-embedded-14/package.nix +++ b/pkgs/by-name/gc/gcc-arm-embedded-14/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; - nativeBuildInputs = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ makeBinaryWrapper darwin.sigtool ]; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ''; preFixup = - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' find $out -type f | while read f; do patchelf "$f" > /dev/null 2>&1 || continue patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { } "$f" || true done '' - + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' find "$out" -executable -type f | while read executable; do ( \ install_name_tool \ diff --git a/pkgs/by-name/gz/gz-cmake/package.nix b/pkgs/by-name/gz/gz-cmake/package.nix index 38a825b0d4ab..c5995dae8250 100644 --- a/pkgs/by-name/gz/gz-cmake/package.nix +++ b/pkgs/by-name/gz/gz-cmake/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs examples/test_c_child_requires_c_no_deps.bash substituteInPlace examples/CMakeLists.txt --replace-fail \ - "$""{CMAKE_INSTALL_LIBDIR}" "${if stdenv.isDarwin then "lib" else "lib64"}" + "$""{CMAKE_INSTALL_LIBDIR}" "${if stdenv.hostPlatform.isDarwin then "lib" else "lib64"}" ''; nativeBuildInputs = [ diff --git a/pkgs/by-name/ht/http-scanner/package.nix b/pkgs/by-name/ht/http-scanner/package.nix index 80d7378aaff2..48197af89519 100644 --- a/pkgs/by-name/ht/http-scanner/package.nix +++ b/pkgs/by-name/ht/http-scanner/package.nix @@ -31,6 +31,6 @@ buildGoModule rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "http-scanner"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/ja/jai/package.nix b/pkgs/by-name/ja/jai/package.nix index 17dabf41a899..b675790b0cd6 100644 --- a/pkgs/by-name/ja/jai/package.nix +++ b/pkgs/by-name/ja/jai/package.nix @@ -37,7 +37,7 @@ let ]; }; in -if stdenv.isLinux then +if stdenv.hostPlatform.isLinux then buildFHSEnv { inherit meta pname version; targetPkgs = pkgs: [ pkgs.zlib ]; diff --git a/pkgs/by-name/li/libcdio/package.nix b/pkgs/by-name/li/libcdio/package.nix index 94a8d43df4b4..026248eedfd3 100644 --- a/pkgs/by-name/li/libcdio/package.nix +++ b/pkgs/by-name/li/libcdio/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-izjZk2kz9PkLm9+INUdl1e7jMz3nUsQKdplKI9Io+CM="; }; - env = lib.optionalAttrs stdenv.is32bit { + env = lib.optionalAttrs stdenv.hostPlatform.is32bit { NIX_CFLAGS_COMPILE = "-D_LARGEFILE64_SOURCE"; }; diff --git a/pkgs/by-name/ma/matrix-brandy/package.nix b/pkgs/by-name/ma/matrix-brandy/package.nix index 2adc72a2e897..7c46b34b6c77 100644 --- a/pkgs/by-name/ma/matrix-brandy/package.nix +++ b/pkgs/by-name/ma/matrix-brandy/package.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { hash = "sha256-sMgYgV4/vV1x5xSICXRpW6K8uCdVlJrS7iEg6XzQRo8="; }; - patches = lib.optionals stdenv.isDarwin [ ./no-lrt.patch ]; + patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./no-lrt.patch ]; - makeFlags = lib.optionals stdenv.isDarwin [ + makeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "CC=cc" "LD=clang" ]; diff --git a/pkgs/by-name/mu/musl-obstack/package.nix b/pkgs/by-name/mu/musl-obstack/package.nix index dfe19c50b41f..8de4fee17b2b 100644 --- a/pkgs/by-name/mu/musl-obstack/package.nix +++ b/pkgs/by-name/mu/musl-obstack/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-oydS7FubUniMHAUWfg84OH9+CZ0JCrTXy7jzwOyJzC8="; }; - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./0001-ignore-obstack_free-alias-on-darwin.patch ]; diff --git a/pkgs/by-name/mu/muvm/package.nix b/pkgs/by-name/mu/muvm/package.nix index 7b59f1052e20..38c9e4e0feaf 100644 --- a/pkgs/by-name/mu/muvm/package.nix +++ b/pkgs/by-name/mu/muvm/package.nix @@ -39,7 +39,7 @@ let dhcpcd passt (placeholder "out") - ] ++ lib.optionals stdenv.isAarch64 [ fex ]; + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ fex ]; wrapArgs = lib.escapeShellArgs [ "--prefix" "PATH" @@ -72,7 +72,7 @@ rustPlatform.buildRustPackage rec { --replace-fail "/sbin/sysctl" "${lib.getExe' procps "sysctl"}" '' # Only patch FEX path if we're aarch64, otherwise we don't want the derivation to pull in FEX in any way - + lib.optionalString stdenv.isAarch64 '' + + lib.optionalString stdenv.hostPlatform.isAarch64 '' substituteInPlace crates/muvm/src/guest/mount.rs \ --replace-fail "/usr/share/fex-emu" "${fex}/share/fex-emu" ''; diff --git a/pkgs/by-name/ne/neofetch/package.nix b/pkgs/by-name/ne/neofetch/package.nix index 62d70f751447..f4ba8f9ec05c 100644 --- a/pkgs/by-name/ne/neofetch/package.nix +++ b/pkgs/by-name/ne/neofetch/package.nix @@ -5,7 +5,7 @@ bash, makeWrapper, pciutils, - x11Support ? !stdenvNoCC.isOpenBSD, + x11Support ? !stdenvNoCC.hostPlatform.isOpenBSD, ueberzug, fetchpatch, }: @@ -56,7 +56,9 @@ stdenvNoCC.mkDerivation { postInstall = '' wrapProgram $out/bin/neofetch \ --prefix PATH : ${ - lib.makeBinPath (lib.optional (!stdenvNoCC.isOpenBSD) pciutils ++ lib.optional x11Support ueberzug) + lib.makeBinPath ( + lib.optional (!stdenvNoCC.hostPlatform.isOpenBSD) pciutils ++ lib.optional x11Support ueberzug + ) } ''; diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix index ff542b27c083..e9461773bafe 100644 --- a/pkgs/by-name/os/osu-lazer-bin/package.nix +++ b/pkgs/by-name/os/osu-lazer-bin/package.nix @@ -55,7 +55,7 @@ let passthru.updateScript = ./update.sh; in -if stdenvNoCC.isDarwin then +if stdenvNoCC.hostPlatform.isDarwin then stdenvNoCC.mkDerivation { inherit pname diff --git a/pkgs/by-name/ov/ovftool/package.nix b/pkgs/by-name/ov/ovftool/package.nix index 3176c2f5c4c8..0e6f07d773e6 100644 --- a/pkgs/by-name/ov/ovftool/package.nix +++ b/pkgs/by-name/ov/ovftool/package.nix @@ -341,7 +341,7 @@ stdenv.mkDerivation (final: { ]; platforms = builtins.attrNames ovftoolSystems; mainProgram = "ovftool"; - knownVulnerabilities = lib.optionals (stdenv.isDarwin) [ + knownVulnerabilities = lib.optionals (stdenv.hostPlatform.isDarwin) [ "The bundled version of openssl 1.0.2zj in ovftool for Darwin has open vulnerabilities." "https://openssl-library.org/news/vulnerabilities-1.0.2/" "CVE-2024-0727" diff --git a/pkgs/by-name/rp/rp/package.nix b/pkgs/by-name/rp/rp/package.nix index 7bf1a58aaf73..f9c0e9e61989 100644 --- a/pkgs/by-name/rp/rp/package.nix +++ b/pkgs/by-name/rp/rp/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { cmake ninja ]; - buildInputs = lib.optionals (stdenv.isLinux) [ stdenv.cc.libc.static ]; + buildInputs = lib.optionals (stdenv.hostPlatform.isLinux) [ stdenv.cc.libc.static ]; src = fetchFromGitHub { owner = "0vercl0k"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp rp-${if stdenv.isDarwin then "osx" else "lin"} $out/bin/rp + cp rp-${if stdenv.hostPlatform.isDarwin then "osx" else "lin"} $out/bin/rp ''; meta = with lib; { diff --git a/pkgs/by-name/ry/ryubing/package.nix b/pkgs/by-name/ry/ryubing/package.nix index a3f1951ef483..d9bcd5c50b1f 100644 --- a/pkgs/by-name/ry/ryubing/package.nix +++ b/pkgs/by-name/ry/ryubing/package.nix @@ -101,7 +101,7 @@ buildDotnetModule rec { "--set SDL_VIDEODRIVER x11" ]; - preInstall = lib.optionalString stdenv.isLinux '' + preInstall = lib.optionalString stdenv.hostPlatform.isLinux '' # workaround for https://github.com/Ryujinx/Ryujinx/issues/2349 mkdir -p $out/lib/sndio-6 ln -s ${sndio}/lib/libsndio.so $out/lib/sndio-6/libsndio.so.6 diff --git a/pkgs/by-name/sp/spider/package.nix b/pkgs/by-name/sp/spider/package.nix index 146baa27c695..d6e99b8d93e5 100644 --- a/pkgs/by-name/sp/spider/package.nix +++ b/pkgs/by-name/sp/spider/package.nix @@ -56,7 +56,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "--skip=pdl_is_fresh" "--skip=verify_revision_available" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Sandbox limitation: attempted to create a NULL object "--skip=website::test_link_duplicates" "--skip=website::not_crawl_blacklist" diff --git a/pkgs/by-name/yn/ynetd/package.nix b/pkgs/by-name/yn/ynetd/package.nix index 80228791058f..5a20bea987a1 100644 --- a/pkgs/by-name/yn/ynetd/package.nix +++ b/pkgs/by-name/yn/ynetd/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-7gioQ0r0LlUftIWKRwTqeZQl0GtskcRKaEE5z6A0S24="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile --replace-fail "-Wl,-z,relro,-z,now" "" ''; diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix index 243028f16365..672054a6640b 100644 --- a/pkgs/development/beam-modules/build-mix.nix +++ b/pkgs/development/beam-modules/build-mix.nix @@ -57,8 +57,8 @@ let in "[${lib.concatStringsSep "," options}]"; - LANG = if stdenv.isLinux then "C.UTF-8" else "C"; - LC_CTYPE = if stdenv.isLinux then "C.UTF-8" else "UTF-8"; + LANG = if stdenv.hostPlatform.isLinux then "C.UTF-8" else "C"; + LC_CTYPE = if stdenv.hostPlatform.isLinux then "C.UTF-8" else "UTF-8"; # add to ERL_LIBS so other modules can find at runtime. # http://erlang.org/doc/man/code.html#code-path diff --git a/pkgs/development/beam-modules/mix-release.nix b/pkgs/development/beam-modules/mix-release.nix index 59a56b98f012..2ab7f9eaa98a 100644 --- a/pkgs/development/beam-modules/mix-release.nix +++ b/pkgs/development/beam-modules/mix-release.nix @@ -138,8 +138,8 @@ stdenv.mkDerivation ( in "[${lib.concatStringsSep "," options}]"; - LANG = if stdenv.isLinux then "C.UTF-8" else "C"; - LC_CTYPE = if stdenv.isLinux then "C.UTF-8" else "UTF-8"; + LANG = if stdenv.hostPlatform.isLinux then "C.UTF-8" else "C"; + LC_CTYPE = if stdenv.hostPlatform.isLinux then "C.UTF-8" else "UTF-8"; postUnpack = '' diff --git a/pkgs/development/compilers/dotnet/packages.nix b/pkgs/development/compilers/dotnet/packages.nix index 0ad73f45a886..b75116914e8c 100644 --- a/pkgs/development/compilers/dotnet/packages.nix +++ b/pkgs/development/compilers/dotnet/packages.nix @@ -162,10 +162,13 @@ let runHook postInstall ''; - ${if stdenvNoCC.isDarwin && lib.versionAtLeast version "10" then "postInstall" else null} = '' - mkdir -p "$out"/nix-support - cp "$src"/nix-support/manual-sdk-deps "$out"/nix-support/manual-sdk-deps - ''; + ${ + if stdenvNoCC.hostPlatform.isDarwin && lib.versionAtLeast version "10" then "postInstall" else null + } = + '' + mkdir -p "$out"/nix-support + cp "$src"/nix-support/manual-sdk-deps "$out"/nix-support/manual-sdk-deps + ''; passthru = { inherit (vmr) icu targetRid hasILCompiler; diff --git a/pkgs/development/compilers/elm/packages/node/node-composition.nix b/pkgs/development/compilers/elm/packages/node/node-composition.nix index a32e52788e8b..559ecd5fb005 100644 --- a/pkgs/development/compilers/elm/packages/node/node-composition.nix +++ b/pkgs/development/compilers/elm/packages/node/node-composition.nix @@ -18,7 +18,7 @@ let writeShellScript ; inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; + libtool = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null; }; in import ./node-packages.nix { diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix index f28a180b5876..2a94c8a6aabf 100644 --- a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix @@ -25,7 +25,7 @@ qtModule { ]; strictDeps = true; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool ]; diff --git a/pkgs/development/lisp-modules/imported.nix b/pkgs/development/lisp-modules/imported.nix index c1e3f1dbe626..00b6e35b5f2c 100644 --- a/pkgs/development/lisp-modules/imported.nix +++ b/pkgs/development/lisp-modules/imported.nix @@ -15922,7 +15922,7 @@ lib.makeScope pkgs.newScope (self: { meta = { hydraPlatforms = [ ]; # darwin cannot find libpango.dylib - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } ); @@ -39541,7 +39541,7 @@ lib.makeScope pkgs.newScope (self: { meta = { hydraPlatforms = [ ]; # darwin cannot find libpango.dylib - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } ); diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index 9a38383f4ad1..ccbf6b855137 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -23,7 +23,7 @@ deployAndroidPackage { pkgs.ncurses5 pkgs.libcxx ] - ++ lib.optionals (os == "linux" && stdenv.isx86_64) ( + ++ lib.optionals (os == "linux" && stdenv.hostPlatform.isx86_64) ( with pkgsi686Linux; [ glibc diff --git a/pkgs/development/php-packages/tideways/default.nix b/pkgs/development/php-packages/tideways/default.nix index 618bd9d960eb..9b3ea0d4d17a 100644 --- a/pkgs/development/php-packages/tideways/default.nix +++ b/pkgs/development/php-packages/tideways/default.nix @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported platform for tideways-php: ${stdenvNoCC.hostPlatform.system}"); - nativeBuildInputs = lib.optionals stdenvNoCC.isLinux [ + nativeBuildInputs = lib.optionals stdenvNoCC.hostPlatform.isLinux [ autoPatchelfHook ]; diff --git a/pkgs/development/python-modules/cut-cross-entropy/default.nix b/pkgs/development/python-modules/cut-cross-entropy/default.nix index 5b20239c56e1..f62b88267c7d 100644 --- a/pkgs/development/python-modules/cut-cross-entropy/default.nix +++ b/pkgs/development/python-modules/cut-cross-entropy/default.nix @@ -58,7 +58,7 @@ buildPythonPackage { transformers ]; # `deepspeed` is not yet packaged in nixpkgs - # ++ lib.optionals (!stdenv.isDarwin) [ + # ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ # deepspeed # ]; }; diff --git a/pkgs/development/python-modules/fmpy/default.nix b/pkgs/development/python-modules/fmpy/default.nix index 0ea342c526cb..f6913ff42909 100644 --- a/pkgs/development/python-modules/fmpy/default.nix +++ b/pkgs/development/python-modules/fmpy/default.nix @@ -119,7 +119,7 @@ buildPythonPackage rec { cmakeConfigurePhase cmake --build native/src/build --config Release '' - + lib.optionalString (enableRemoting && stdenv.isLinux) '' + + lib.optionalString (enableRemoting && stdenv.hostPlatform.isLinux) '' # reimplementation of native/build_remoting.py cmakeFlags="-S native/remoting -B remoting/linux64 -D RPCLIB=${rpclib}" cmakeConfigurePhase diff --git a/pkgs/development/python-modules/peft/default.nix b/pkgs/development/python-modules/peft/default.nix index 07caadc59cd7..290d5d64e2a5 100644 --- a/pkgs/development/python-modules/peft/default.nix +++ b/pkgs/development/python-modules/peft/default.nix @@ -71,7 +71,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "tests" ]; # These tests fail when MPS devices are detected - disabledTests = lib.optional stdenv.isDarwin [ + disabledTests = lib.optional stdenv.hostPlatform.isDarwin [ "gpu" ]; diff --git a/pkgs/development/python-modules/prometheus-fastapi-instrumentator/default.nix b/pkgs/development/python-modules/prometheus-fastapi-instrumentator/default.nix index d60c4c658ad1..5dcc297b38d2 100644 --- a/pkgs/development/python-modules/prometheus-fastapi-instrumentator/default.nix +++ b/pkgs/development/python-modules/prometheus-fastapi-instrumentator/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { ]; # numerous test failures on Darwin - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; pythonImportsCheck = [ "prometheus_fastapi_instrumentator" ]; diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix index 2585c7dda9f5..48bf2a93bfdf 100644 --- a/pkgs/development/python-modules/pygal/default.nix +++ b/pkgs/development/python-modules/pygal/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { __impureHostDeps = [ "/System/Library/Fonts" ]; postCheck = '' - export LANG=${if stdenv.isDarwin then "en_US.UTF-8" else "C.UTF-8"} + export LANG=${if stdenv.hostPlatform.isDarwin then "en_US.UTF-8" else "C.UTF-8"} ''; meta = with lib; { diff --git a/pkgs/development/python-modules/smolagents/default.nix b/pkgs/development/python-modules/smolagents/default.nix index 8da324604d45..4aa0bfc487c8 100644 --- a/pkgs/development/python-modules/smolagents/default.nix +++ b/pkgs/development/python-modules/smolagents/default.nix @@ -132,7 +132,7 @@ buildPythonPackage rec { "test_visit_webpage" "test_wikipedia_search" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Missing dependencies "test_get_mlx" diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix index 7cbfb50fce01..de1ccf5b6539 100644 --- a/pkgs/development/python-modules/vllm/default.nix +++ b/pkgs/development/python-modules/vllm/default.nix @@ -295,7 +295,7 @@ buildPythonPackage rec { lib.optionals cpuSupport [ oneDNN ] - ++ lib.optionals (cpuSupport && stdenv.isLinux) [ + ++ lib.optionals (cpuSupport && stdenv.hostPlatform.isLinux) [ numactl ] ++ lib.optionals cudaSupport ( diff --git a/pkgs/servers/nextcloud/packages/apps/recognize.nix b/pkgs/servers/nextcloud/packages/apps/recognize.nix index 1e7fb2570fd4..0845d35f08be 100644 --- a/pkgs/servers/nextcloud/packages/apps/recognize.nix +++ b/pkgs/servers/nextcloud/packages/apps/recognize.nix @@ -10,7 +10,7 @@ ffmpeg-headless, # Current derivation only supports linux-x86_64 (contributions welcome, without libTensorflow builtin webassembly can be used) - useLibTensorflow ? stdenv.isx86_64 && stdenv.isLinux, + useLibTensorflow ? stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isLinux, ncVersion, }: diff --git a/pkgs/tools/system/uefitool/new-engine.nix b/pkgs/tools/system/uefitool/new-engine.nix index a7d908493728..c177c23078d3 100644 --- a/pkgs/tools/system/uefitool/new-engine.nix +++ b/pkgs/tools/system/uefitool/new-engine.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { zip wrapQtAppsHook ]; - patches = lib.optionals stdenv.isDarwin [ ./bundle-destination.patch ]; + patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./bundle-destination.patch ]; meta = { description = "UEFI firmware image viewer and editor";