diff options
| author | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2018-08-31 17:32:48 +0200 |
|---|---|---|
| committer | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2018-08-31 17:32:48 +0200 |
| commit | 93550cbddfeacd4902bebbfaab2c9c3d337f5650 (patch) | |
| tree | df3259694e2c0ab3ae79449601880ce68e365f7e /pkgs/applications/window-managers/i3/default.nix | |
| parent | a9780a095bd05c5104c643f927a680194d040a92 (diff) | |
| parent | dde959a8965af69e19a4bf7b246095a97dc3dbc8 (diff) | |
| download | nixlib-93550cbddfeacd4902bebbfaab2c9c3d337f5650.tar nixlib-93550cbddfeacd4902bebbfaab2c9c3d337f5650.tar.gz nixlib-93550cbddfeacd4902bebbfaab2c9c3d337f5650.tar.bz2 nixlib-93550cbddfeacd4902bebbfaab2c9c3d337f5650.tar.lz nixlib-93550cbddfeacd4902bebbfaab2c9c3d337f5650.tar.xz nixlib-93550cbddfeacd4902bebbfaab2c9c3d337f5650.tar.zst nixlib-93550cbddfeacd4902bebbfaab2c9c3d337f5650.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/window-managers/i3/default.nix')
| -rw-r--r-- | pkgs/applications/window-managers/i3/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 513fe06df8f6..5c95b9daf251 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -36,9 +36,9 @@ stdenv.mkDerivation rec { # they shouldn't, and then even once that's fixed have some # perl-related errors later on. For more, see # https://github.com/NixOS/nixpkgs/issues/7957 - doCheck = false; # stdenv.system == "x86_64-linux"; + doCheck = false; # stdenv.hostPlatform.system == "x86_64-linux"; - checkPhase = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") + checkPhase = stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") '' (cd testcases && xvfb-run ./complete-run.pl -p 1 --keep-xserver-output) ! grep -q '^not ok' testcases/latest/complete-run.log |