diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2018-03-17 15:06:49 +0100 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2018-03-17 15:06:49 +0100 |
commit | f9134b08c2838b1fddb580c52c0d8527b7b5210a (patch) | |
tree | 2fdcfb301b53f6dfc7e914722afd53c120bb35c7 /pkgs/development/libraries/wlroots/default.nix | |
parent | 5693c5da8efb0ba48e2f60b06ffea25c604db040 (diff) | |
download | nixpkgs-f9134b08c2838b1fddb580c52c0d8527b7b5210a.tar nixpkgs-f9134b08c2838b1fddb580c52c0d8527b7b5210a.tar.gz nixpkgs-f9134b08c2838b1fddb580c52c0d8527b7b5210a.tar.bz2 nixpkgs-f9134b08c2838b1fddb580c52c0d8527b7b5210a.tar.lz nixpkgs-f9134b08c2838b1fddb580c52c0d8527b7b5210a.tar.xz nixpkgs-f9134b08c2838b1fddb580c52c0d8527b7b5210a.tar.zst nixpkgs-f9134b08c2838b1fddb580c52c0d8527b7b5210a.zip |
wlroots: 2017-12-22 -> 2018-03-16
Diffstat (limited to 'pkgs/development/libraries/wlroots/default.nix')
-rw-r--r-- | pkgs/development/libraries/wlroots/default.nix | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index a5ec872c360..3fdaeb82438 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -1,23 +1,20 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig , wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman -, xcbutilwm, libX11, libcap, xcbutilimage +, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors }: let pname = "wlroots"; - version = "unstable-2017-12-22"; + version = "unstable-2018-03-16"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchFromGitHub { owner = "swaywm"; repo = "wlroots"; - rev = "0a370c529806077a11638e7fa856d5fbb539496b"; - sha256 = "0h3i0psn5595dncv53l5m2mf13k9wcv3qi16vla5ckpskykc0xx6"; + rev = "9cc875429b40e2567b219f8e9ffd23316d136204"; + sha256 = "1prhic3pyf9n65qfg5akzkc9qv2z3ab60dpcacr7wgr9nxrvnsdq"; }; - # TODO: Temporary workaround for compilation errors - patches = [ ./libdrm.patch ]; #./no-werror.patch - # $out for the library and $bin for rootston outputs = [ "out" "bin" ]; @@ -25,7 +22,7 @@ in stdenv.mkDerivation rec { buildInputs = [ wayland libGL wayland-protocols libinput libxkbcommon pixman - xcbutilwm libX11 libcap xcbutilimage + xcbutilwm libX11 libcap xcbutilimage xcbutilerrors ]; # Install rootston (the reference compositor) to $bin @@ -33,7 +30,7 @@ in stdenv.mkDerivation rec { mkdir -p $bin/bin cp rootston/rootston $bin/bin/ mkdir $bin/lib - cp libwlroots.so $bin/lib/ + cp libwlroots* $bin/lib/ patchelf --set-rpath "$bin/lib:${stdenv.lib.makeLibraryPath buildInputs}" $bin/bin/rootston mkdir $bin/etc cp ../rootston/rootston.ini.example $bin/etc/rootston.ini |