diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2020-01-23 14:19:59 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-23 14:19:59 +0100 |
commit | 5a4b93e33c35e87c0d1c0a342de3bad0c7e754a0 (patch) | |
tree | bf1b42672414ba60bcaa790e432731bfe7748e6a /pkgs/development | |
parent | ab6eebbe204836d04614ff70aa5f4f1d34ab0569 (diff) | |
parent | 4eedf77818f48ff20f18dd14b2d9f719f1f6a573 (diff) | |
download | nixpkgs-5a4b93e33c35e87c0d1c0a342de3bad0c7e754a0.tar nixpkgs-5a4b93e33c35e87c0d1c0a342de3bad0c7e754a0.tar.gz nixpkgs-5a4b93e33c35e87c0d1c0a342de3bad0c7e754a0.tar.bz2 nixpkgs-5a4b93e33c35e87c0d1c0a342de3bad0c7e754a0.tar.lz nixpkgs-5a4b93e33c35e87c0d1c0a342de3bad0c7e754a0.tar.xz nixpkgs-5a4b93e33c35e87c0d1c0a342de3bad0c7e754a0.tar.zst nixpkgs-5a4b93e33c35e87c0d1c0a342de3bad0c7e754a0.zip |
Merge pull request #76787 from primeos/sway
sway: 1.2 -> 1.4, wlroots: 0.8.1 -> 0.10.0
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/wlroots/default.nix | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index a567e66285c..9f9c4acb0d8 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -1,29 +1,20 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, fetchpatch , wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa -, libpng, ffmpeg_4, freerdp +, libpng, ffmpeg_4 }: stdenv.mkDerivation rec { pname = "wlroots"; - version = "0.8.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "swaywm"; repo = "wlroots"; rev = version; - sha256 = "1ak86kx617c81dy85wg9rldy1z3n8ch93cjc05a4j6sifv0nkyfm"; + sha256 = "0c0q1p9yss5kx4430ik3n89drqpmm2bvgl8fjlf6prac1a7xzqn8"; }; - 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): outputs = [ "out" "examples" ]; @@ -32,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ wayland libGL wayland-protocols libinput libxkbcommon pixman xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa - libpng ffmpeg_4 freerdp + libpng ffmpeg_4 ]; mesonFlags = [ |