cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #122475 from stephank/fix-wayland-darwin

Browse source 
wayland: fix build on darwin
This commit is contained in:
Michael Weiss 2021-05-12 20:18:48 +02:00 committed by GitHub
commit a605e0318d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/libraries/wayland/default.nix
View file

@ -1,6 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchurl , fetchurl
, fetchpatch
, substituteAll , substituteAll
, meson , meson
, pkg-config , pkg-config
@ -37,6 +38,11 @@ stdenv.mkDerivation rec {
}; };
patches = [ patches = [
# Picked from upstream 'main' branch for Darwin support.
(fetchpatch {
url = "https://gitlab.freedesktop.org/wayland/wayland/-/commit/f452e41264387dee4fd737cbf1af58b34b53941b.patch";
sha256 = "00mk32a01vgn31sm3wk4p8mfwvqv3xv02rxvdj1ygnzgb1ac62r7";
})
(substituteAll { (substituteAll {
src = ./0001-add-placeholder-for-nm.patch; src = ./0001-add-placeholder-for-nm.patch;
nm = "${stdenv.cc.targetPrefix}nm"; nm = "${stdenv.cc.targetPrefix}nm";