movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-09 19:13:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

treewide: replace stdenv.is with stdenv.hostPlatform.is

Browse source
This commit is contained in:
Peder Bergebakken Sundt 2025-03-03 04:56:11 +01:00
parent 2075894398
commit e171199c50
51 changed files with 77 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/editors/rstudio/default.nix
View file

@ -140,7 +140,7 @@ stdenv.mkDerivation rec {
(lib.cmakeBool "QUARTO_ENABLED" true) (lib.cmakeBool "QUARTO_ENABLED" true)
(lib.cmakeBool "RSTUDIO_CRASHPAD_ENABLED" false) # This is a NOOP except on x86_64-darwin (lib.cmakeBool "RSTUDIO_CRASHPAD_ENABLED" false) # This is a NOOP except on x86_64-darwin
(lib.cmakeFeature "CMAKE_INSTALL_PREFIX" ( (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" (
(placeholder "out") + (if stdenv.isDarwin then "/Applications" else "/lib/rstudio") (placeholder "out") + (if stdenv.hostPlatform.isDarwin then "/Applications" else "/lib/rstudio")
)) ))
] ]
++ lib.optionals (!server) [ ++ lib.optionals (!server) [

2
pkgs/applications/science/electronics/qucs-s/default.nix
View file

@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ flex bison wrapQtAppsHook cmake ]; nativeBuildInputs = [ flex bison wrapQtAppsHook cmake ];
buildInputs = [ qtbase qttools qtcharts qtsvg gperf adms ] buildInputs = [ qtbase qttools qtcharts qtsvg gperf adms ]
++ lib.optionals stdenv.isLinux [ qtwayland libX11 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland libX11 ]
++ kernels; ++ kernels;
cmakeFlags = [ cmakeFlags = [

2
pkgs/applications/video/jellyfin-media-player/default.nix
View file

@ -82,7 +82,7 @@ mkDerivation rec {
ln -s ${jellyfin-web}/share/jellyfin-web . ln -s ${jellyfin-web}/share/jellyfin-web .
''; '';
postInstall = lib.optionalString stdenv.isDarwin '' postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir -p $out/bin $out/Applications mkdir -p $out/bin $out/Applications
mv "$out/Jellyfin Media Player.app" $out/Applications mv "$out/Jellyfin Media Player.app" $out/Applications
ln -s "$out/Applications/Jellyfin Media Player.app/Contents/MacOS/Jellyfin Media Player" $out/bin/jellyfinmediaplayer ln -s "$out/Applications/Jellyfin Media Player.app/Contents/MacOS/Jellyfin Media Player" $out/bin/jellyfinmediaplayer

2
pkgs/by-name/am/amazon-cloudwatch-agent/package.nix
View file

@ -48,7 +48,7 @@ buildGoModule rec {
versionCheckProgramArg = "-version"; versionCheckProgramArg = "-version";
passthru = { passthru = {
tests = lib.optionalAttrs stdenv.isLinux { tests = lib.optionalAttrs stdenv.hostPlatform.isLinux {
inherit (nixosTests) amazon-cloudwatch-agent; inherit (nixosTests) amazon-cloudwatch-agent;
}; };

4
pkgs/by-name/am/amneziawg-tools/package.nix
View file

@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
substituteInPlace $out/lib/systemd/system/awg-quick@.service \ substituteInPlace $out/lib/systemd/system/awg-quick@.service \
--replace-fail /usr/bin $out/bin --replace-fail /usr/bin $out/bin
'' ''
+ lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux ''
for f in $out/bin/*; do for f in $out/bin/*; do
# Which firewall and resolvconf implementations to use should be determined by the # Which firewall and resolvconf implementations to use should be determined by the
# environment, we provide the "default" ones as fallback. # environment, we provide the "default" ones as fallback.
@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
} }
done done
'' ''
+ lib.optionalString stdenv.isDarwin '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
for f in $out/bin/*; do for f in $out/bin/*; do
wrapProgram $f \ wrapProgram $f \
--prefix PATH : ${lib.makeBinPath [ amneziawg-go ]} --prefix PATH : ${lib.makeBinPath [ amneziawg-go ]}

4
pkgs/by-name/cr/crusader/package.nix
View file

@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec {
makeWrapper makeWrapper
pkg-config pkg-config
] ]
++ lib.optionals stdenv.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux [
autoPatchelfHook autoPatchelfHook
]; ];
@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec {
libgcc libgcc
libxkbcommon libxkbcommon
] ]
++ lib.optionals stdenv.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux [
xorg.libX11 xorg.libX11
xorg.libXcursor xorg.libXcursor
xorg.libXi xorg.libXi

2
pkgs/by-name/dn/dnstap/package.nix
View file

@ -40,7 +40,7 @@ buildGoModule rec {
homepage = "https://dnstap.info"; homepage = "https://dnstap.info";
changelog = "https://github.com/dnstap/golang-dnstap/releases/tag/${src.rev}"; changelog = "https://github.com/dnstap/golang-dnstap/releases/tag/${src.rev}";
license = lib.licenses.asl20; license = lib.licenses.asl20;
broken = stdenv.isDarwin; broken = stdenv.hostPlatform.isDarwin;
maintainers = [ lib.maintainers.azahi ]; maintainers = [ lib.maintainers.azahi ];
mainProgram = "dnstap"; mainProgram = "dnstap";
}; };

2
pkgs/by-name/ex/excalidraw_export/package.nix
View file

@ -35,6 +35,6 @@ buildNpmPackage rec {
license = lib.licenses.mit; license = lib.licenses.mit;
maintainers = with lib.maintainers; [ venikx ]; maintainers = with lib.maintainers; [ venikx ];
mainProgram = "excalidraw_export"; mainProgram = "excalidraw_export";
broken = stdenv.isDarwin; broken = stdenv.hostPlatform.isDarwin;
}; };
} }

2
pkgs/by-name/fl/flexget/package.nix
View file

@ -105,7 +105,7 @@ python3Packages.buildPythonApplication rec {
python3Packages.paramiko python3Packages.paramiko
]; ];
doCheck = !stdenv.isDarwin; doCheck = !stdenv.hostPlatform.isDarwin;
disabledTests = [ disabledTests = [
# reach the Internet # reach the Internet

8
pkgs/by-name/fo/foundry/package.nix
View file

@ -25,9 +25,11 @@ rustPlatform.buildRustPackage rec {
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-vVRFS7o0zV+ek9ho+URks6peOryMpFCE1sDzN9g7uH0="; cargoHash = "sha256-vVRFS7o0zV+ek9ho+URks6peOryMpFCE1sDzN9g7uH0=";
nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ darwin.DarwinTools ]; nativeBuildInputs = [
pkg-config
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ];
buildInputs = [ solc ] ++ lib.optionals stdenv.isDarwin [ libusb1 ]; buildInputs = [ solc ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libusb1 ];
# Tests are run upstream, and many perform I/O # Tests are run upstream, and many perform I/O
# incompatible with the nix build sandbox. # incompatible with the nix build sandbox.
@ -44,7 +46,7 @@ rustPlatform.buildRustPackage rec {
env = { env = {
SVM_RELEASES_LIST_JSON = SVM_RELEASES_LIST_JSON =
if stdenv.isDarwin then if stdenv.hostPlatform.isDarwin then
# Confusingly, these are universal binaries, not amd64. # Confusingly, these are universal binaries, not amd64.
# See: https://github.com/ethereum/solidity/issues/12291#issuecomment-1974771433 # See: https://github.com/ethereum/solidity/issues/12291#issuecomment-1974771433
"${./svm-lists/macosx-amd64.json}" "${./svm-lists/macosx-amd64.json}"

2
pkgs/by-name/g3/g3proxy/package.nix
View file

@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec {
c-ares c-ares
lua5_4 lua5_4
] ]
++ lib.optionals stdenv.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.Security
]; ];

4
pkgs/by-name/go/golden-cheetah/package.nix
View file

@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
''; '';
installPhase = installPhase =
if stdenv.isLinux then if stdenv.hostPlatform.isLinux then
'' ''
runHook preInstall runHook preInstall
@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
runHook postInstall runHook postInstall
'' ''
else if stdenv.isDarwin then else if stdenv.hostPlatform.isDarwin then
'' ''
runHook preInstall runHook preInstall
mkdir -p $out/Applications mkdir -p $out/Applications

2
pkgs/by-name/ia/iamb/package.nix
View file

@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
export HOME=$(mktemp -d) export HOME=$(mktemp -d)
''; '';
checkFlags = lib.optionals stdenv.isDarwin [ checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [
# Attempted to create a NULL object. # Attempted to create a NULL object.
"--skip=base::tests::test_complete_cmdbar" "--skip=base::tests::test_complete_cmdbar"
"--skip=base::tests::test_complete_msgbar" "--skip=base::tests::test_complete_msgbar"

2
pkgs/by-name/ki/kikoplay/package.nix
View file

@ -92,6 +92,6 @@ stdenv.mkDerivation rec {
homepage = "https://kikoplay.fun"; homepage = "https://kikoplay.fun";
license = lib.licenses.gpl3Only; license = lib.licenses.gpl3Only;
# See https://github.com/NixOS/nixpkgs/pull/354929 # See https://github.com/NixOS/nixpkgs/pull/354929
broken = stdenv.isDarwin; broken = stdenv.hostPlatform.isDarwin;
}; };
} }

4
pkgs/by-name/li/libcosmicAppHook/package.nix
View file

@ -38,7 +38,7 @@ makeSetupHook {
xorg.libXi xorg.libXi
xorg.libxcb xorg.libxcb
] ]
++ lib.optionals (!stdenv.isDarwin) [ ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
wayland wayland
vulkan-loader vulkan-loader
]; ];
@ -64,7 +64,7 @@ makeSetupHook {
# for x11rb # for x11rb
"xcb" "xcb"
] ]
++ lib.optionals (!stdenv.isDarwin) [ ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
# for wgpu-hal, wayland-sys # for wgpu-hal, wayland-sys
"wayland-client" "wayland-client"
# for wgpu-hal # for wgpu-hal

2
pkgs/by-name/li/librist/package.nix
View file

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
}; };
# avoid rebuild on Linux for now # avoid rebuild on Linux for now
patches = lib.optionals stdenv.isDarwin [ patches = lib.optionals stdenv.hostPlatform.isDarwin [
# https://code.videolan.org/rist/librist/-/issues/192 # https://code.videolan.org/rist/librist/-/issues/192
./no-brew-darwin.diff ./no-brew-darwin.diff
]; ];

2
pkgs/by-name/li/livekit-libwebrtc/package.nix
View file

@ -166,7 +166,7 @@ stdenv.mkDerivation {
cpio cpio
pkg-config pkg-config
] ]
++ lib.optionals stdenv.isDarwin [ xcbuild ]; ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
buildInputs = buildInputs =
[ nasm ] [ nasm ]

2
pkgs/by-name/ln/lnav/package.nix
View file

@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
curl curl
libarchive libarchive
] ]
++ lib.optionals (!stdenv.isDarwin) [ ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
gpm gpm
]; ];

2
pkgs/by-name/lo/logrotate/package.nix
View file

@ -5,7 +5,7 @@
gzip, gzip,
popt, popt,
autoreconfHook, autoreconfHook,
aclSupport ? stdenv.isLinux, aclSupport ? stdenv.hostPlatform.isLinux,
acl, acl,
nixosTests, nixosTests,
}: }:

2
pkgs/by-name/ma/mattermost/tests.nix
View file

@ -143,7 +143,7 @@ mattermost.overrideAttrs (
"TestSessionStore/MySQL/SessionGetWithDeviceId" "TestSessionStore/MySQL/SessionGetWithDeviceId"
"TestSessionStore/MySQL/GetMobileSessionMetadata" "TestSessionStore/MySQL/GetMobileSessionMetadata"
] ]
++ optionals (!stdenv.isx86_64) [ ++ optionals (!stdenv.hostPlatform.isx86_64) [
# aarch64: invalid operating system or processor architecture # aarch64: invalid operating system or processor architecture
"TestCanIUpgradeToE0" "TestCanIUpgradeToE0"
]; ];

2
pkgs/by-name/mc/mcpelauncher-client/package.nix
View file

@ -55,7 +55,7 @@ clangStdenv.mkDerivation (finalAttrs: {
]; ];
# Path hard-coded paths. # Path hard-coded paths.
postPatch = lib.optionalString stdenv.isLinux '' postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
substituteInPlace mcpelauncher-client/src/jni/main_activity.cpp \ substituteInPlace mcpelauncher-client/src/jni/main_activity.cpp \
--replace-fail /usr/bin/xdg-open ${xdg-utils}/bin/xdg-open \ --replace-fail /usr/bin/xdg-open ${xdg-utils}/bin/xdg-open \
--replace-fail /usr/bin/zenity ${zenity}/bin/zenity --replace-fail /usr/bin/zenity ${zenity}/bin/zenity

4
pkgs/by-name/me/megacmd/package.nix
View file

@ -26,7 +26,7 @@ let
pname = "megacmd"; pname = "megacmd";
version = "1.7.0"; version = "1.7.0";
srcOptions = srcOptions =
if stdenv.isLinux then if stdenv.hostPlatform.isLinux then
{ {
tag = "${version}_Linux"; tag = "${version}_Linux";
hash = "sha256-UlSqwM8GQKeG8/K0t5DbM034NQOeBg+ujNi/MMsVCuM="; hash = "sha256-UlSqwM8GQKeG8/K0t5DbM034NQOeBg+ujNi/MMsVCuM=";
@ -56,7 +56,7 @@ stdenv.mkDerivation {
]; ];
buildInputs = buildInputs =
lib.optionals stdenv.isLinux [ gcc-unwrapped ] # fix: ld: cannot find lib64/libstdc++fs.a lib.optionals stdenv.hostPlatform.isLinux [ gcc-unwrapped ] # fix: ld: cannot find lib64/libstdc++fs.a
++ [ ++ [
c-ares c-ares
cryptopp cryptopp

4
pkgs/by-name/my/mydumper/package.nix
View file

@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
zlib zlib
zstd zstd
] ]
++ lib.optionals stdenv.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux [
libselinux libselinux
libsepol libsepol
]; ];
@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
]; ];
env.NIX_CFLAGS_COMPILE = ( env.NIX_CFLAGS_COMPILE = (
if stdenv.isDarwin then if stdenv.hostPlatform.isDarwin then
toString [ toString [
"-Wno-error=deprecated-non-prototype" "-Wno-error=deprecated-non-prototype"
"-Wno-error=format" "-Wno-error=format"

2
pkgs/by-name/ox/oxide-rs/package.nix
View file

@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec {
openssl openssl
zlib zlib
] ]
++ lib.optionals stdenv.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.SystemConfiguration darwin.apple_sdk.frameworks.SystemConfiguration
]; ];

2
pkgs/by-name/pr/proxychains-ng/package.nix
View file

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
}) })
]; ];
configureFlags = lib.optionals stdenv.isDarwin [ configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [
"--hookmethod=${darwinHookMethod}" "--hookmethod=${darwinHookMethod}"
]; ];

2
pkgs/by-name/qo/qownnotes/package.nix
View file

@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
--fish <(xvfb-run $out/bin/${finalAttrs.appname} --completion fish) --fish <(xvfb-run $out/bin/${finalAttrs.appname} --completion fish)
'' ''
# Install shell completion on macOS # Install shell completion on macOS
+ lib.optionalString stdenv.isDarwin '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
installShellCompletion --cmd ${finalAttrs.pname} \ installShellCompletion --cmd ${finalAttrs.pname} \
--bash <($out/bin/${finalAttrs.appname} --completion bash) \ --bash <($out/bin/${finalAttrs.appname} --completion bash) \
--fish <($out/bin/${finalAttrs.appname} --completion fish) --fish <($out/bin/${finalAttrs.appname} --completion fish)

12
pkgs/by-name/ry/ryubing/package.nix
View file

@ -39,7 +39,7 @@ buildDotnetModule rec {
hash = "sha256-pLzmfrdjpn2DTg2AJF1yyTJJPxHScQTX+yq9MbuzMHk="; hash = "sha256-pLzmfrdjpn2DTg2AJF1yyTJJPxHScQTX+yq9MbuzMHk=";
}; };
nativeBuildInputs = lib.optional stdenv.isDarwin [ nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin [
cctools cctools
darwin.sigtool darwin.sigtool
]; ];
@ -75,17 +75,17 @@ buildDotnetModule rec {
libGL libGL
SDL2 SDL2
] ]
++ lib.optional (!stdenv.isDarwin) [ ++ lib.optional (!stdenv.hostPlatform.isDarwin) [
udev udev
pulseaudio pulseaudio
] ]
++ lib.optional stdenv.isDarwin [ moltenvk ]; ++ lib.optional stdenv.hostPlatform.isDarwin [ moltenvk ];
projectFile = "Ryujinx.sln"; projectFile = "Ryujinx.sln";
testProjectFile = "src/Ryujinx.Tests/Ryujinx.Tests.csproj"; testProjectFile = "src/Ryujinx.Tests/Ryujinx.Tests.csproj";
# Tests on Darwin currently fail because of Ryujinx.Tests.Unicorn # Tests on Darwin currently fail because of Ryujinx.Tests.Unicorn
doCheck = !stdenv.isDarwin; doCheck = !stdenv.hostPlatform.isDarwin;
dotnetFlags = [ dotnetFlags = [
"/p:ExtraDefineConstants=DISABLE_UPDATER%2CFORCE_EXTERNAL_BASE_DIR" "/p:ExtraDefineConstants=DISABLE_UPDATER%2CFORCE_EXTERNAL_BASE_DIR"
@ -107,7 +107,7 @@ buildDotnetModule rec {
''; '';
preFixup = '' preFixup = ''
${lib.optionalString stdenv.isLinux '' ${lib.optionalString stdenv.hostPlatform.isLinux ''
mkdir -p $out/share/{applications,icons/hicolor/scalable/apps,mime/packages} mkdir -p $out/share/{applications,icons/hicolor/scalable/apps,mime/packages}
pushd ${src}/distribution/linux pushd ${src}/distribution/linux
@ -121,7 +121,7 @@ buildDotnetModule rec {
''} ''}
# Don't make a softlink on OSX because of its case insensitivity # Don't make a softlink on OSX because of its case insensitivity
${lib.optionalString (!stdenv.isDarwin) "ln -s $out/bin/Ryujinx $out/bin/ryujinx"} ${lib.optionalString (!stdenv.hostPlatform.isDarwin) "ln -s $out/bin/Ryujinx $out/bin/ryujinx"}
''; '';
passthru.updateScript = ./updater.sh; passthru.updateScript = ./updater.sh;

2
pkgs/by-name/sd/sdl3/package.nix
View file

@ -47,7 +47,7 @@
libudevSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, libudevSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,
sndioSupport ? false, sndioSupport ? false,
testSupport ? true, testSupport ? true,
waylandSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, waylandSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,
x11Support ? !stdenv.hostPlatform.isAndroid && !stdenv.hostPlatform.isWindows, x11Support ? !stdenv.hostPlatform.isAndroid && !stdenv.hostPlatform.isWindows,
}: }:

2
pkgs/by-name/so/sov/package.nix
View file

@ -64,6 +64,6 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = with lib.maintainers; [ ]; maintainers = with lib.maintainers; [ ];
inherit (wayland.meta) platforms; inherit (wayland.meta) platforms;
# sys/timerfd.h header inexistent # sys/timerfd.h header inexistent
broken = stdenv.isDarwin; broken = stdenv.hostPlatform.isDarwin;
}; };
}) })

4
pkgs/by-name/st/stegseek/package.nix
View file

@ -32,10 +32,10 @@ stdenv.mkDerivation rec {
]; ];
# tests get stuck on aarch64-linux # tests get stuck on aarch64-linux
doCheck = stdenv.isx86_64 && stdenv.isLinux; doCheck = stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isLinux;
meta = with lib; { meta = with lib; {
broken = stdenv.isDarwin; broken = stdenv.hostPlatform.isDarwin;
description = "Tool to crack steganography"; description = "Tool to crack steganography";
longDescription = '' longDescription = ''
Stegseek is a lightning fast steghide cracker that can be Stegseek is a lightning fast steghide cracker that can be

10
pkgs/by-name/tr/tracy/package.nix
View file

@ -25,8 +25,8 @@
wayland-protocols, wayland-protocols,
}: }:
assert withGtkFileSelector -> stdenv.isLinux; assert withGtkFileSelector -> stdenv.hostPlatform.isLinux;
assert withWayland -> stdenv.isLinux; assert withWayland -> stdenv.hostPlatform.isLinux;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = if withWayland then "tracy-wayland" else "tracy-glfw"; pname = if withWayland then "tracy-wayland" else "tracy-glfw";
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
ninja ninja
pkg-config pkg-config
] ]
++ lib.optionals stdenv.isLinux [ wayland-scanner ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland-scanner ]
++ lib.optionals stdenv.cc.isClang [ stdenv.cc.cc.libllvm ]; ++ lib.optionals stdenv.cc.isClang [ stdenv.cc.cc.libllvm ];
buildInputs = buildInputs =
@ -79,8 +79,8 @@ stdenv.mkDerivation rec {
"-DDOWNLOAD_CAPSTONE=off" "-DDOWNLOAD_CAPSTONE=off"
"-DTRACY_STATIC=off" "-DTRACY_STATIC=off"
] ]
++ lib.optional (stdenv.isLinux && withGtkFileSelector) "-DGTK_FILESELECTOR=ON" ++ lib.optional (stdenv.hostPlatform.isLinux && withGtkFileSelector) "-DGTK_FILESELECTOR=ON"
++ lib.optional (stdenv.isLinux && !withWayland) "-DLEGACY=on"; ++ lib.optional (stdenv.hostPlatform.isLinux && !withWayland) "-DLEGACY=on";
env.NIX_CFLAGS_COMPILE = toString ( env.NIX_CFLAGS_COMPILE = toString (
[ ] [ ]

2
pkgs/by-name/tw/twitch-hls-client/package.nix
View file

@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-sqhB2Lj3RK1OyXy87Be9aOkfcksqz+5VfRTlKuswerU="; cargoHash = "sha256-sqhB2Lj3RK1OyXy87Be9aOkfcksqz+5VfRTlKuswerU=";
buildInputs = lib.optionals stdenv.isDarwin [ buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.Security
]; ];

2
pkgs/by-name/ua/uasm/package.nix
View file

@ -52,6 +52,6 @@ stdenv.mkDerivation rec {
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ thiagokokada ]; maintainers = with maintainers; [ thiagokokada ];
license = licenses.watcom; license = licenses.watcom;
broken = stdenv.isDarwin; broken = stdenv.hostPlatform.isDarwin;
}; };
} }

4
pkgs/by-name/va/vanillatd/package.nix
View file

@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
''; '';
installPhase = installPhase =
if stdenv.isDarwin then if stdenv.hostPlatform.isDarwin then
'' ''
runHook preInstall runHook preInstall
@ -146,7 +146,7 @@ stdenv.mkDerivation (finalAttrs: {
buildPhase = buildPhase =
let let
Default_Data_Path = Default_Data_Path =
if stdenv.isDarwin then if stdenv.hostPlatform.isDarwin then
"$out/Applications/${appName}.app/Contents/share/${appName}" "$out/Applications/${appName}.app/Contents/share/${appName}"
else else
"$out/share/${appName}"; "$out/share/${appName}";

4
pkgs/by-name/vs/vsmartcard-pcsc-relay/package.nix
View file

@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
] ]
)) ))
] ]
++ lib.optionals stdenv.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.PCSC darwin.apple_sdk.frameworks.PCSC
]; ];
@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://frankmorgner.github.io/vsmartcard/pcsc-relay/README.html"; homepage = "https://frankmorgner.github.io/vsmartcard/pcsc-relay/README.html";
license = lib.licenses.gpl3Only; license = lib.licenses.gpl3Only;
platforms = lib.platforms.all; platforms = lib.platforms.all;
broken = stdenv.isDarwin; broken = stdenv.hostPlatform.isDarwin;
maintainers = with lib.maintainers; [ stargate01 ]; maintainers = with lib.maintainers; [ stargate01 ];
}; };
}) })

6
pkgs/by-name/vs/vsmartcard-vpcd/package.nix
View file

@ -46,18 +46,18 @@ stdenv.mkDerivation (finalAttrs: {
] ]
)) ))
] ]
++ lib.optionals stdenv.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.PCSC darwin.apple_sdk.frameworks.PCSC
]; ];
configureFlags = lib.optional stdenv.isDarwin "--enable-infoplist"; configureFlags = lib.optional stdenv.hostPlatform.isDarwin "--enable-infoplist";
meta = { meta = {
description = "Emulates a smart card and makes it accessible through PC/SC"; description = "Emulates a smart card and makes it accessible through PC/SC";
homepage = "http://frankmorgner.github.io/vsmartcard/virtualsmartcard/README.html"; homepage = "http://frankmorgner.github.io/vsmartcard/virtualsmartcard/README.html";
license = lib.licenses.gpl3Only; license = lib.licenses.gpl3Only;
platforms = lib.platforms.all; platforms = lib.platforms.all;
broken = stdenv.isDarwin; broken = stdenv.hostPlatform.isDarwin;
maintainers = with lib.maintainers; [ stargate01 ]; maintainers = with lib.maintainers; [ stargate01 ];
}; };
}) })

2
pkgs/by-name/zf/zfs-replicate/package.nix
View file

@ -44,7 +44,7 @@ python3Packages.buildPythonApplication rec {
doCheck = true; doCheck = true;
disabledTestPaths = lib.optionals stdenv.isDarwin [ disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
# AssertionError: Expected SystemExit or FileNotFoundError # AssertionError: Expected SystemExit or FileNotFoundError
"zfs_test/replicate_test/cli_test/main_test.py" "zfs_test/replicate_test/cli_test/main_test.py"
]; ];

2
pkgs/development/compilers/binaryen/default.nix
View file

@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
"lit" "lit"
"gtest" "gtest"
]; ];
doCheck = stdenv.isLinux; doCheck = stdenv.hostPlatform.isLinux;
meta = with lib; { meta = with lib; {
homepage = "https://github.com/WebAssembly/binaryen"; homepage = "https://github.com/WebAssembly/binaryen";

2
pkgs/development/libraries/librsvg/default.nix
View file

@ -143,7 +143,7 @@ stdenv.mkDerivation (finalAttrs: {
# Probably broken MIME type detection on Darwin. # Probably broken MIME type detection on Darwin.
# Tests fail with imprecise rendering on i686. # Tests fail with imprecise rendering on i686.
doCheck = !stdenv.isDarwin && !stdenv.hostPlatform.isi686; doCheck = !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isi686;
env = { env = {
PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_QUERY_LOADERS = writeShellScript "gdk-pixbuf-loader-loaders-wrapped" '' PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_QUERY_LOADERS = writeShellScript "gdk-pixbuf-loader-loaders-wrapped" ''

2
pkgs/development/libraries/qtspell/default.nix
View file

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
enchant enchant
qtbase qtbase
] ]
++ lib.optionals stdenv.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [
glib glib
llvmPackages.clang llvmPackages.clang
]; ];

2
pkgs/development/python-modules/distutils/default.nix
View file

@ -59,7 +59,7 @@ buildPythonPackage rec {
]; ];
# jaraco-path depends ob pyobjc # jaraco-path depends ob pyobjc
doCheck = !stdenv.isDarwin; doCheck = !stdenv.hostPlatform.isDarwin;
meta = { meta = {
description = "Distutils as found in cpython"; description = "Distutils as found in cpython";

2
pkgs/development/python-modules/kaleido/default.nix
View file

@ -93,7 +93,7 @@ buildPythonPackage rec {
#ln -s ${dejavu_fonts}/share/fonts/truetype/* $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/dejavu/ #ln -s ${dejavu_fonts}/share/fonts/truetype/* $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/dejavu/
#ln -s ${lato}/share/fonts/lato/* $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/lato/ #ln -s ${lato}/share/fonts/lato/* $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/lato/
'' ''
+ lib.optionalString (!stdenv.isDarwin) '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
# Replace bundled swiftshader with libGL # Replace bundled swiftshader with libGL
rm -rf $out/${python.sitePackages}/kaleido/executable/bin/swiftshader rm -rf $out/${python.sitePackages}/kaleido/executable/bin/swiftshader
ln -s ${libGL}/lib $out/${python.sitePackages}/kaleido/executable/bin/swiftshader ln -s ${libGL}/lib $out/${python.sitePackages}/kaleido/executable/bin/swiftshader

4
pkgs/development/python-modules/libuuu/default.nix
View file

@ -25,11 +25,11 @@ buildPythonPackage rec {
setuptools-scm setuptools-scm
]; ];
nativeBuildInputs = lib.optionals stdenv.isLinux [ nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
autoPatchelfHook autoPatchelfHook
]; ];
buildInputs = lib.optionals stdenv.isLinux [ buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
udev udev
]; ];

2
pkgs/development/python-modules/nidaqmx/default.nix
View file

@ -54,7 +54,7 @@ buildPythonPackage rec {
click click
requests requests
] ]
++ lib.optionals stdenv.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux [
distro distro
]; ];

2
pkgs/development/python-modules/primp/default.nix
View file

@ -38,7 +38,7 @@ let
# Remove bazel specific build file to make way for build directory # Remove bazel specific build file to make way for build directory
# This is a problem on Darwin because of case-insensitive filesystem # This is a problem on Darwin because of case-insensitive filesystem
preBuild = preBuild =
(lib.optionalString stdenv.isDarwin '' (lib.optionalString stdenv.hostPlatform.isDarwin ''
rm ../BUILD rm ../BUILD
'') '')
+ oa.preBuild; + oa.preBuild;

2
pkgs/development/python-modules/waitress/default.nix
View file

@ -27,7 +27,7 @@ buildPythonPackage rec {
pytest-cov-stub pytest-cov-stub
]; ];
doCheck = !stdenv.isDarwin; doCheck = !stdenv.hostPlatform.isDarwin;
disabledTests = [ disabledTests = [
# access to socket # access to socket
"test_service_port" "test_service_port"

2
pkgs/development/python-modules/zenoh/default.nix
View file

@ -33,7 +33,7 @@ buildPythonPackage rec {
rustc rustc
]; ];
buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security;
pythonImportsCheck = [ pythonImportsCheck = [
"zenoh" "zenoh"

2
pkgs/tools/backup/monolith/default.nix
View file

@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/Y2Z/monolith"; homepage = "https://github.com/Y2Z/monolith";
license = licenses.cc0; license = licenses.cc0;
platforms = lib.platforms.unix; platforms = lib.platforms.unix;
broken = stdenv.isDarwin; broken = stdenv.hostPlatform.isDarwin;
maintainers = with maintainers; [ Br1ght0ne ]; maintainers = with maintainers; [ Br1ght0ne ];
}; };
} }

2
pkgs/tools/networking/dd-agent/datadog-agent.nix
View file

@ -44,7 +44,7 @@ in buildGo122Module rec {
doCheck = false; doCheck = false;
vendorHash = if stdenv.isDarwin vendorHash = if stdenv.hostPlatform.isDarwin
then "sha256-3Piq5DPMTZUEjqNkw5HZY25An2kATX6Jac9unQfZnZc=" then "sha256-3Piq5DPMTZUEjqNkw5HZY25An2kATX6Jac9unQfZnZc="
else "sha256-FR0Et3DvjJhbYUPy9mpN0QCJ7QDU4VRZFUTL0J1FSXw="; else "sha256-FR0Et3DvjJhbYUPy9mpN0QCJ7QDU4VRZFUTL0J1FSXw=";

4
pkgs/tools/system/nvtop/build-nvtop.nix
View file

@ -66,8 +66,8 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = buildInputs =
[ ncurses ] [ ncurses ]
++ lib.optional stdenv.isLinux udev ++ lib.optional stdenv.hostPlatform.isLinux udev
++ lib.optional stdenv.isDarwin apple-sdk_12 ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_12
++ lib.optional nvidia cudatoolkit ++ lib.optional nvidia cudatoolkit
++ lib.optional needDrm libdrm; ++ lib.optional needDrm libdrm;

2
pkgs/top-level/all-packages.nix
View file

@ -3132,7 +3132,7 @@ with pkgs;
tsm-client-withGui = callPackage ../by-name/ts/tsm-client/package.nix { enableGui = true; }; tsm-client-withGui = callPackage ../by-name/ts/tsm-client/package.nix { enableGui = true; };
tracy = callPackage ../by-name/tr/tracy/package.nix { withWayland = stdenv.isLinux; }; tracy = callPackage ../by-name/tr/tracy/package.nix { withWayland = stdenv.hostPlatform.isLinux; };
tracy-glfw = callPackage ../by-name/tr/tracy/package.nix { withWayland = false; }; tracy-glfw = callPackage ../by-name/tr/tracy/package.nix { withWayland = false; };
tracy-wayland = callPackage ../by-name/tr/tracy/package.nix { withWayland = true; }; tracy-wayland = callPackage ../by-name/tr/tracy/package.nix { withWayland = true; };