wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 10:41:16 +02:00
Code Activity

packages.nix: Fix installUnitTests condition

Browse source 
The intent was we install the tests when we can *not* run them. Instead,
we were installing them when we can.
This commit is contained in:
John Ericson 2024-01-11 13:55:28 -05:00
parent 84502674f8
commit a923444a94
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
package.nix
View file

@ -100,7 +100,7 @@
# Whether to install unit tests. This is useful when cross compiling # Whether to install unit tests. This is useful when cross compiling
# since we cannot run them natively during the build, but can do so # since we cannot run them natively during the build, but can do so
# later. # later.
, installUnitTests ? __forDefaults.canRunInstalled , installUnitTests ? doBuild && !__forDefaults.canExecuteHost
# For running the functional tests against a pre-built Nix. Probably # For running the functional tests against a pre-built Nix. Probably
# want to use in conjunction with `doBuild = false;`. # want to use in conjunction with `doBuild = false;`.
@ -113,7 +113,8 @@
# Not a real argument, just the only way to approximate let-binding some # Not a real argument, just the only way to approximate let-binding some
# stuff for argument defaults. # stuff for argument defaults.
, __forDefaults ? { , __forDefaults ? {
canRunInstalled = doBuild && stdenv.buildPlatform.canExecute stdenv.hostPlatform; canExecuteHost = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
canRunInstalled = doBuild && __forDefaults.canExecuteHost;
} }
}: }: