public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #73977 from B4dM4n/wlroots-fix-build

Browse Source 
wlroots: fix build
This commit is contained in:
Michael Weiss 2019-11-23 19:00:51 +01:00 committed by GitHub
commit d1ee508194
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/wlroots/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, fetchpatch
, wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman , wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman
, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa
, libpng, ffmpeg_4, freerdp , libpng, ffmpeg_4, freerdp
@ -15,6 +15,15 @@ stdenv.mkDerivation rec {
sha256 = "1ak86kx617c81dy85wg9rldy1z3n8ch93cjc05a4j6sifv0nkyfm"; sha256 = "1ak86kx617c81dy85wg9rldy1z3n8ch93cjc05a4j6sifv0nkyfm";
}; };
patches = [
# add missing header that changed in mesa-19.2.2
# https://github.com/swaywm/wlroots/issues/1862
(fetchpatch {
url = "https://github.com/swaywm/wlroots/commit/d113e48a2a32542fe6e12f1759f07888364609bf.diff";
sha256 = "1h09j1gmnzlz4py92a92chgy8xzsd8h8xn5irq9s2hq4cla66h87";
})
];
# $out for the library and $examples for the example programs (in examples): # $out for the library and $examples for the example programs (in examples):
outputs = [ "out" "examples" ]; outputs = [ "out" "examples" ];