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

Merge pull request #33487 from LnL7/sierra-shared-test 

sierra-shared-test: fix build
This commit is contained in:
John Ericson 2018-01-05 18:06:59 -05:00 committed by GitHub
parent 80f13dc31d 80de99b46b
commit 88c227ff75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/test/macos-sierra-shared/default.nix
View File

@ -3,7 +3,7 @@
let let
makeBigExe = stdenv: prefix: rec { makeBigExe = stdenv: prefix: rec {
count = 500; count = 320;
sillyLibs = lib.genList (i: stdenv.mkDerivation rec { sillyLibs = lib.genList (i: stdenv.mkDerivation rec {
name = "${prefix}-fluff-${toString i}"; name = "${prefix}-fluff-${toString i}";
@ -75,13 +75,14 @@ in stdenvNoCC.mkDerivation {
buildInputs = [ good.finalExe bad.finalExe ]; buildInputs = [ good.finalExe bad.finalExe ];
# TODO(@Ericson2314): Be impure or require exact MacOS version of builder? # TODO(@Ericson2314): Be impure or require exact MacOS version of builder?
buildCommand = '' buildCommand = ''
if bad-asdf if bad-asdf &> /dev/null
then echo "bad-asdf can succeed on non-sierra, OK" >&2 then echo "WARNING: bad-asdf did not fail, not running on sierra?" >&2
else echo "bad-asdf should fail on sierra, OK" >&2 else echo "bad-asdf should fail on sierra, OK" >&2
fi fi
# Must succeed on all supported MacOS versions # Must succeed on all supported MacOS versions
good-asdf good-asdf
echo "good-asdf should succeed on sierra, OK"
touch $out touch $out
''; '';