diff options
| author | Nick Cao <nickcao@nichi.co> | 2024-03-05 22:47:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-05 22:47:25 -0500 |
| commit | 0f32c1cda5b82c5027a94b906db6cad4669c6cdc (patch) | |
| tree | 1e5f2b1de7d88facfb69712a749c705ea4d89584 /pkgs/tools/wayland | |
| parent | 9052a2666b6292fced270a2264776c203442fbe1 (diff) | |
| parent | 03b6fa7416dcefc181dc27e0bab9c2d764e21b51 (diff) | |
| download | nixlib-0f32c1cda5b82c5027a94b906db6cad4669c6cdc.tar nixlib-0f32c1cda5b82c5027a94b906db6cad4669c6cdc.tar.gz nixlib-0f32c1cda5b82c5027a94b906db6cad4669c6cdc.tar.bz2 nixlib-0f32c1cda5b82c5027a94b906db6cad4669c6cdc.tar.lz nixlib-0f32c1cda5b82c5027a94b906db6cad4669c6cdc.tar.xz nixlib-0f32c1cda5b82c5027a94b906db6cad4669c6cdc.tar.zst nixlib-0f32c1cda5b82c5027a94b906db6cad4669c6cdc.zip | |
Merge pull request #291856 from NickCao/way-displays
way-displays: fix cross compilation, unset DESTDIR
Diffstat (limited to 'pkgs/tools/wayland')
| -rw-r--r-- | pkgs/tools/wayland/way-displays/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/tools/wayland/way-displays/default.nix b/pkgs/tools/wayland/way-displays/default.nix index 192e8aecc4fa..50ffefd1a6f9 100644 --- a/pkgs/tools/wayland/way-displays/default.nix +++ b/pkgs/tools/wayland/way-displays/default.nix @@ -31,7 +31,12 @@ stdenv.mkDerivation rec { libinput ]; - makeFlags = [ "DESTDIR=$(out) PREFIX= PREFIX_ETC= ROOT_ETC=$(out)/etc"]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + "PREFIX_ETC=${placeholder "out"}" + "CC:=$(CC)" + "CXX:=$(CXX)" + ]; meta = with lib; { homepage = "https://github.com/alex-courtis/way-displays"; |