Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion pkgs/applications/audio/csound/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp
++ lib.optional stdenv.isDarwin "-DCS_FRAMEWORK_DEST=${placeholder "out"}/lib"
# Ignore gettext in CMAKE_PREFIX_PATH on cross to prevent find_program picking up the wrong gettext
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DCMAKE_IGNORE_PATH=${lib.getBin gettext}/bin";
++ lib.optional (!lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform) "-DCMAKE_IGNORE_PATH=${lib.getBin gettext}/bin";

nativeBuildInputs = [ cmake flex bison gettext ];
buildInputs = [ libsndfile libsamplerate boost ]
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/vcv-rack/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ stdenv.mkDerivation rec {
zstd
];

makeFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
makeFlags = lib.optionals (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) [
"CROSS_COMPILE=${stdenv.cc.targetPrefix}"
] ++ [
"all"
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/editors/mg/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-88FrXN7h5uRLY8YMKSzUjBF4n18DEiiiDyoYr+7qXdQ=";
};

postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
postPatch = lib.optionalString (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) ''
substituteInPlace configure --replace "./conftest" "echo"
'';

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/editors/oed/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
hash = "sha256-bbV89YhrmL7tOgKly5OfQDRz4QE0UzZrVsmoXiJ7ZZw=";
};

postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
postPatch = lib.optionalString (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) ''
substituteInPlace configure --replace "./conftest" "echo"
'';

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/editors/poke/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
}:

let
isCross = stdenv.hostPlatform != stdenv.buildPlatform;
isCross = (!lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform);
in
stdenv.mkDerivation (finalAttrs: {
pname = "poke";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/editors/vim/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ stdenv.mkDerivation {
configureFlags = [
"--enable-multibyte"
"--enable-nls"
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) ([
] ++ lib.optionals (!lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform) ([
"vim_cv_toupper_broken=no"
"--with-tlib=ncurses"
"vim_cv_terminfo=yes"
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/editors/vim/full.nix
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ in stdenv.mkDerivation {
"--disable-nextaf_check"
"--disable-carbon_check"
"--disable-gtktest"
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
] ++ lib.optionals (!lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform) [
"vim_cv_toupper_broken=no"
"--with-tlib=ncurses"
"vim_cv_terminfo=yes"
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/editors/zile/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
]
# `help2man' wants to run Zile, which won't work when the
# newly-produced binary can't be run at build-time.
++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) help2man;
++ lib.optional (lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform) help2man;

# Tests can't be run because most of them rely on the ability to
# fiddle with the terminal.
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/graphics/sane/backends/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ stdenv.mkDerivation {

# autoconf check for HAVE_MMAP is never set on cross compilation.
# The pieusb backend fails compilation if HAVE_MMAP is not set.
buildFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "CFLAGS=-DHAVE_MMAP=${if stdenv.hostPlatform.isLinux then "1" else "0"}" ];
buildFlags = lib.optionals (!lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform) [ "CFLAGS=-DHAVE_MMAP=${if stdenv.hostPlatform.isLinux then "1" else "0"}" ];

postInstall = let

Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/misc/comodoro/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
, fetchFromGitHub
, stdenv
, installShellFiles
, installShellCompletions ? stdenv.hostPlatform == stdenv.buildPlatform
, installManPages ? stdenv.hostPlatform == stdenv.buildPlatform
, installShellCompletions ? (lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform)
, installManPages ? (lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform)
, withTcp ? true
}:

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/misc/mangal/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ buildGoModule rec {

nativeBuildInputs = [ installShellFiles ];

postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
postInstall = lib.optionalString (lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform) ''
# Mangal creates a config file in the folder ~/.config/mangal and fails if not possible
export MANGAL_CONFIG_PATH=`mktemp -d`
installShellCompletion --cmd mangal \
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/misc/visidata/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ buildPythonApplication rec {
];

# check phase uses the output bin, which is not possible when cross-compiling
doCheck = stdenv.buildPlatform == stdenv.hostPlatform;
doCheck = (lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform);

checkPhase = ''
runHook preCheck
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/networking/browsers/chromium/common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ let
host_toolchain = "//build/toolchain/linux/unbundle:default";
# We only build those specific toolchains when we cross-compile, as native non-cross-compilations would otherwise
# end up building much more things than they need to (roughtly double the build steps and time/compute):
} // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
} // lib.optionalAttrs (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) {
host_toolchain = "//build/toolchain/linux/unbundle:host";
v8_snapshot_toolchain = "//build/toolchain/linux/unbundle:host";
} // {
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/networking/browsers/elinks/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
, # Incompatible licenses, LGPLv3 - GPLv2
enableGuile ? false, guile ? null
, enablePython ? false, python ? null
, enablePerl ? (!stdenv.isDarwin) && (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null
, enablePerl ? (!stdenv.isDarwin) && (lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform), perl ? null
# re-add javascript support when upstream supports modern spidermonkey
}:

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/networking/browsers/firefox/common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ in
, jackSupport ? stdenv.isLinux, libjack2
, jemallocSupport ? !stdenv.hostPlatform.isMusl, jemalloc
, ltoSupport ? (stdenv.isLinux && stdenv.is64bit && !stdenv.hostPlatform.isRiscV), overrideCC, buildPackages
, pgoSupport ? (stdenv.isLinux && stdenv.hostPlatform == stdenv.buildPlatform), xvfb-run
, pgoSupport ? (stdenv.isLinux && (lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform)), xvfb-run
, pipewireSupport ? waylandSupport && webrtcSupport
, pulseaudioSupport ? stdenv.isLinux, libpulseaudio
, sndioSupport ? stdenv.isLinux, sndio
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/w3m/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec {
})
];

postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
postPatch = lib.optionalString (!lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform) ''
ln -s ${mktable}/bin/mktable mktable
# stop make from recompiling mktable
sed -ie 's!mktable.*:.*!mktable:!' Makefile.in
Expand All @@ -68,7 +68,7 @@ in stdenv.mkDerivation rec {

configureFlags =
[ "--with-ssl=${openssl.dev}" "--with-gc=${boehmgc.dev}" ]
++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
++ lib.optionals (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) [
"ac_cv_func_setpgrp_void=yes"
]
++ lib.optional graphicsSupport "--enable-image=${lib.optionalString x11Support "x11,"}fb"
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/networking/cluster/argo/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ buildGoModule rec {

postInstall = ''
for shell in bash zsh; do
${if (stdenv.buildPlatform == stdenv.hostPlatform)
${if (lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform)
then "$out/bin/argo"
else "${pkgsBuildBuild.argo}/bin/argo"
} completion $shell > argo.$shell
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/networking/cluster/fluxcd/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ in buildGoModule rec {
$out/bin/flux --version | grep ${version} > /dev/null
'';

postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
postInstall = lib.optionalString (lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform) ''
for shell in bash fish zsh; do
$out/bin/flux completion $shell > flux.$shell
installShellCompletion flux.$shell
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/networking/cluster/kaniko/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ buildGoModule rec {

doCheck = false; # requires docker, container-diff (unpackaged yet)

postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
postInstall = lib.optionalString (lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform) ''
for shell in bash fish zsh; do
$out/bin/executor completion $shell > executor.$shell
installShellCompletion executor.$shell
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/networking/cluster/kubeshark/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ buildGoModule rec {
'';
doCheck = true;

postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
postInstall = lib.optionalString (lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform) ''
installShellCompletion --cmd kubeshark \
--bash <($out/bin/kubeshark completion bash) \
--fish <($out/bin/kubeshark completion fish) \
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/networking/cluster/kubevela/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ buildGoModule rec {
'';

nativeBuildInputs = [ installShellFiles ];
postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
postInstall = lib.optionalString (lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform) ''
installShellCompletion --cmd vela \
--bash <($out/bin/vela completion bash) \
--zsh <($out/bin/vela completion zsh)
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/networking/cluster/velero/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ buildGoModule rec {
'';

nativeBuildInputs = [ installShellFiles ];
postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
postInstall = lib.optionalString (lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform) ''
$out/bin/velero completion bash > velero.bash
$out/bin/velero completion zsh > velero.zsh
installShellCompletion velero.{bash,zsh}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {

doCheck = false;

postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
postPatch = lib.optionalString (!lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform) ''
pkg-config() { "''${PKG_CONFIG}" "$@"; }
export -f pkg-config
'';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ let
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
'';

doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform;
doInstallCheck = (lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform);
# In particular, this detects missing python imports in some of the tools.
postFixup = let
# TODO: python is a script, so it doesn't work as interpreter on darwin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
"-DENABLE_TESTS=${if doCheck then "ON" else "OFF"}"
];

doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
doCheck = (lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform);
nativeCheckInputs = [ check ];

meta = with lib; {
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/networking/offrss/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
'';

buildInputs = [ curl libmrss ]
++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) podofo
++ lib.optional (lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform) podofo
++ lib.optional (!stdenv.isLinux) libiconv;

# Workaround build failure on -fno-common toolchains:
Expand All @@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
--replace '$(CC) $(CFLAGS) $(LDFLAGS)' '$(CXX) $(CFLAGS) $(LDFLAGS)'
'' + lib.optionalString (!stdenv.isLinux) ''
sed 's/#EXTRA/EXTRA/' -i Makefile
'' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
'' + lib.optionalString (!lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform) ''
sed 's/^PDF/#PDF/' -i Makefile
'';

Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/networking/sniffers/wireshark/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
./patches/lookup-dumpcap-in-path.patch
];

depsBuildBuild = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
depsBuildBuild = lib.optionals (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) [
buildPackages.stdenv.cc
];

Expand Down Expand Up @@ -141,7 +141,7 @@ stdenv.mkDerivation rec {
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DENABLE_APPLICATION_BUNDLE=${if withQt && stdenv.isDarwin then "ON" else "OFF"}"
"-DLEMON_C_COMPILER=cc"
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
] ++ lib.optionals (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) [
"-DHAVE_C99_VSNPRINTF_EXITCODE__TRYRUN_OUTPUT="
"-DHAVE_C99_VSNPRINTF_EXITCODE=0"
];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/office/kmymoney/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
"kmymoney/plugins/woob/interface/kmymoneywoob.py"
'';

doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform;
doInstallCheck = (lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform);
nativeInstallCheckInputs = [ xvfb-run ];
installCheckPhase =
lib.optionalString doInstallCheck ''
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
, mkOpenModelicaDerivation
}:
let
isCross = stdenv.buildPlatform != stdenv.hostPlatform;
isCross = (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform);
nativeOMCompiler = buildPackages.openmodelica.omcompiler;
in
mkOpenModelicaDerivation ({
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/terminal-emulators/foot/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ let

# PGO only makes sense if we are not cross compiling and
# using a compiler which foot's PGO build supports (clang or gcc)
doPgo = allowPgo && (stdenv.hostPlatform == stdenv.buildPlatform)
doPgo = allowPgo && (lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform)
&& compilerName != "unknown";

terminfoDir = "${placeholder "terminfo"}/share/terminfo";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/fossil/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {

enableParallelBuilding = true;

doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
doCheck = (lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform);

configureFlags =
lib.optional (!withInternalSqlite) "--disable-internal-sqlite"
Expand Down
10 changes: 5 additions & 5 deletions pkgs/applications/version-management/git/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45
, libxslt, tcl, tk, makeWrapper, libiconv
, svnSupport ? false, subversionClient, perlLibs, smtpPerlLibs
, perlSupport ? stdenv.buildPlatform == stdenv.hostPlatform
, perlSupport ? (lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform)
, nlsSupport ? true
, osxkeychainSupport ? stdenv.isDarwin
, guiSupport ? false
Expand Down Expand Up @@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {

configureFlags = [
"ac_cv_prog_CURL_CONFIG=${lib.getDev curl}/bin/curl-config"
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
] ++ lib.optionals (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) [
"ac_cv_fread_reads_directories=yes"
"ac_cv_snprintf_returns_bogus=no"
"ac_cv_iconv_omits_bom=no"
Expand All @@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
]
# Git does not allow setting a shell separately for building and run-time.
# Therefore lets leave it at the default /bin/sh when cross-compiling
++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) "SHELL_PATH=${stdenv.shell}"
++ lib.optional (lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) "SHELL_PATH=${stdenv.shell}"
++ (if perlSupport then ["PERL_PATH=${perlPackages.perl}/bin/perl"] else ["NO_PERL=1"])
++ (if pythonSupport then ["PYTHON_PATH=${python3}/bin/python"] else ["NO_PYTHON=1"])
++ lib.optionals stdenv.isSunOS ["INSTALL=install" "NO_INET_NTOP=" "NO_INET_PTON="]
Expand All @@ -122,9 +122,9 @@ stdenv.mkDerivation (finalAttrs: {
#
# See https://github.com/Homebrew/homebrew-core/commit/dfa3ccf1e7d3901e371b5140b935839ba9d8b706
++ lib.optional stdenv.isDarwin "TKFRAMEWORK=/nonexistent"
++ lib.optional (stdenv.hostPlatform.isFreeBSD && stdenv.hostPlatform != stdenv.buildPlatform) "uname_S=FreeBSD";
++ lib.optional (stdenv.hostPlatform.isFreeBSD && (!lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform)) "uname_S=FreeBSD";

disallowedReferences = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
disallowedReferences = lib.optionals (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) [
stdenv.shellPackage
];

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/glab/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ buildGoModule rec {

nativeBuildInputs = [ installShellFiles ];

postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
postInstall = lib.optionalString (lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform) ''
make manpage
installManPage share/man/man1/*
installShellCompletion --cmd glab \
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/mercurial/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ let
requiredSystemFeatures = [ "big-parallel" ];

# Don't run tests if not-Linux or if cross-compiling.
meta.broken = !stdenv.hostPlatform.isLinux || stdenv.buildPlatform != stdenv.hostPlatform;
meta.broken = !stdenv.hostPlatform.isLinux || (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform);
} ''
addToSearchPathWithCustomDelimiter : PYTHONPATH "${mercurial}/${python.sitePackages}"

Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/rcs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
DIFF3 = "${diffutils}/bin/diff3";

disallowedReferences =
lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform)
lib.optionals (!lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform)
[ buildPackages.diffutils buildPackages.ed ];

env.NIX_CFLAGS_COMPILE = "-std=c99";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/video/kodi/unwrapped.nix
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ in stdenv.mkDerivation (finalAttrs: {

preConfigure = ''
cmakeFlagsArray+=("-DCORE_PLATFORM_NAME=${lib.concatStringsSep " " kodi_platforms}")
'' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
'' + lib.optionalString (!lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform) ''
# Need these tools on the build system when cross compiling,
# hacky, but have found no other way.
CXX=$CXX_FOR_BUILD LD=ld make -C tools/depends/native/JsonSchemaBuilder
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/video/mplayer/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ let
meta.license = lib.licenses.unfree;
} else null;

crossBuild = stdenv.hostPlatform != stdenv.buildPlatform;
crossBuild = (!lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform);

in

Expand Down
Loading