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 | |
| 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')
5 files changed, 10 insertions, 10 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 diff --git a/pkgs/applications/window-managers/way-cooler/way-cooler.nix b/pkgs/applications/window-managers/way-cooler/way-cooler.nix index 8a740b15500d..d7816be56256 100644 --- a/pkgs/applications/window-managers/way-cooler/way-cooler.nix +++ b/pkgs/applications/window-managers/way-cooler/way-cooler.nix @@ -1,6 +1,6 @@ # Generated by carnix 0.6.5: carnix -o way-cooler.nix Cargo.lock -{ lib, buildPlatform, buildRustCrate, fetchgit }: -let kernel = buildPlatform.parsed.kernel.name; +{ lib, stdenv, buildRustCrate, fetchgit }: +let kernel = stdenv.buildPlatform.parsed.kernel.name; updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); mapFeatures = features: map (fun: fun { features = features; }); mkFeatures = feat: lib.lists.foldl (features: featureName: diff --git a/pkgs/applications/window-managers/way-cooler/wc-bg.nix b/pkgs/applications/window-managers/way-cooler/wc-bg.nix index c63123db7ccb..4d527715c5f2 100644 --- a/pkgs/applications/window-managers/way-cooler/wc-bg.nix +++ b/pkgs/applications/window-managers/way-cooler/wc-bg.nix @@ -1,6 +1,6 @@ # Generated by carnix 0.6.5: carnix -o wc-bg.nix Cargo.lock -{ lib, buildPlatform, buildRustCrate, fetchgit }: -let kernel = buildPlatform.parsed.kernel.name; +{ lib, stdenv, buildRustCrate, fetchgit }: +let kernel = stdenv.buildPlatform.parsed.kernel.name; updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); mapFeatures = features: map (fun: fun { features = features; }); mkFeatures = feat: lib.lists.foldl (features: featureName: diff --git a/pkgs/applications/window-managers/way-cooler/wc-grab.nix b/pkgs/applications/window-managers/way-cooler/wc-grab.nix index 947a9653e56d..6f936eb2e432 100644 --- a/pkgs/applications/window-managers/way-cooler/wc-grab.nix +++ b/pkgs/applications/window-managers/way-cooler/wc-grab.nix @@ -1,6 +1,6 @@ # Generated by carnix 0.6.5: carnix -o wc-grab.nix Cargo.lock -{ lib, buildPlatform, buildRustCrate, fetchgit }: -let kernel = buildPlatform.parsed.kernel.name; +{ lib, stdenv, buildRustCrate, fetchgit }: +let kernel = stdenv.hostPlatform.parsed.kernel.name; updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); mapFeatures = features: map (fun: fun { features = features; }); mkFeatures = feat: lib.lists.foldl (features: featureName: diff --git a/pkgs/applications/window-managers/way-cooler/wc-lock.nix b/pkgs/applications/window-managers/way-cooler/wc-lock.nix index 008df5479ce1..1b9e3df3508e 100644 --- a/pkgs/applications/window-managers/way-cooler/wc-lock.nix +++ b/pkgs/applications/window-managers/way-cooler/wc-lock.nix @@ -1,6 +1,6 @@ # Generated by carnix 0.6.5: carnix -o wc-lock.nix Cargo.lock -{ lib, buildPlatform, buildRustCrate, fetchgit }: -let kernel = buildPlatform.parsed.kernel.name; +{ lib, stdenv, buildRustCrate, fetchgit }: +let kernel = stdenv.hostPlatform.parsed.kernel.name; updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); mapFeatures = features: map (fun: fun { features = features; }); mkFeatures = feat: lib.lists.foldl (features: featureName: |