diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2021-05-12 20:18:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-12 20:18:48 +0200 |
| commit | a605e0318da6dedc54e54827e95991b5dfbf3ab6 (patch) | |
| tree | 2f84f6e5db0b309644fd3644909aa08db436382e /pkgs/development/libraries/wayland | |
| parent | ba7dccbda781d00a0c4e537a25f9f7798ef2c0c6 (diff) | |
| parent | 6543ad4db0cc78a0c78251d0a0c9cee98c3720ed (diff) | |
| download | nixpkgs-a605e0318da6dedc54e54827e95991b5dfbf3ab6.tar nixpkgs-a605e0318da6dedc54e54827e95991b5dfbf3ab6.tar.gz nixpkgs-a605e0318da6dedc54e54827e95991b5dfbf3ab6.tar.bz2 nixpkgs-a605e0318da6dedc54e54827e95991b5dfbf3ab6.tar.lz nixpkgs-a605e0318da6dedc54e54827e95991b5dfbf3ab6.tar.xz nixpkgs-a605e0318da6dedc54e54827e95991b5dfbf3ab6.tar.zst nixpkgs-a605e0318da6dedc54e54827e95991b5dfbf3ab6.zip | |
Merge pull request #122475 from stephank/fix-wayland-darwin
wayland: fix build on darwin
Diffstat (limited to 'pkgs/development/libraries/wayland')
| -rw-r--r-- | pkgs/development/libraries/wayland/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 4a685b43073..c62431769b5 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , substituteAll , meson , pkg-config @@ -37,6 +38,11 @@ stdenv.mkDerivation rec { }; patches = [ + # Picked from upstream 'main' branch for Darwin support. + (fetchpatch { + url = "https://gitlab.freedesktop.org/wayland/wayland/-/commit/f452e41264387dee4fd737cbf1af58b34b53941b.patch"; + sha256 = "00mk32a01vgn31sm3wk4p8mfwvqv3xv02rxvdj1ygnzgb1ac62r7"; + }) (substituteAll { src = ./0001-add-placeholder-for-nm.patch; nm = "${stdenv.cc.targetPrefix}nm"; |