Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5693c5da8efb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f9134b08c283
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Mar 17, 2018

  1. wlroots: 2017-12-22 -> 2018-03-16

    @primeos
    primeos committed Mar 17, 2018

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    f9134b0 View commit details
Showing with 6 additions and 28 deletions.
  1. +6 −9 pkgs/development/libraries/wlroots/default.nix
  2. +0 −9 pkgs/development/libraries/wlroots/libdrm.patch
  3. +0 −10 pkgs/development/libraries/wlroots/no-werror.patch
15 changes: 6 additions & 9 deletions pkgs/development/libraries/wlroots/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,39 +1,36 @@
{ 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" ];

nativeBuildInputs = [ meson ninja pkgconfig ];

buildInputs = [
wayland libGL wayland-protocols libinput libxkbcommon pixman
xcbutilwm libX11 libcap xcbutilimage
xcbutilwm libX11 libcap xcbutilimage xcbutilerrors
];

# Install rootston (the reference compositor) to $bin
postInstall = ''
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
9 changes: 0 additions & 9 deletions pkgs/development/libraries/wlroots/libdrm.patch
View file

This file was deleted.

10 changes: 0 additions & 10 deletions pkgs/development/libraries/wlroots/no-werror.patch
View file

This file was deleted.