@@ -6,18 +6,17 @@
7stdenv.mkDerivation rec {
7stdenv.mkDerivation rec {
8 pname = "wlroots";
8 pname = "wlroots";
9− version = "0.6.0";
9+ version = "0.7.0";
11 src = fetchFromGitHub {
11 src = fetchFromGitHub {
12 owner = "swaywm";
12 owner = "swaywm";
13 repo = "wlroots";
13 repo = "wlroots";
14 rev = version;
14 rev = version;
15− sha256 = "1rdcmll5b8w242n6yfjpsaprq280ck2jmbz46dxndhignxgda7k4";
15+ sha256 = "0jzxa6psbc7ddxli7rbfqxmv1svxnis51l1vch4hb9fdixqm284a";
18− # $out for the library, $bin for rootston, and $examples for the example
18+ # $out for the library and $examples for the example programs (in examples):
19− # programs (in examples) AND rootston
20− outputs = [ "out" "bin" "examples" ];
19+ outputs = [ "out" "examples" ];
22 nativeBuildInputs = [ meson ninja pkgconfig ];
21 nativeBuildInputs = [ meson ninja pkgconfig ];
@@ -32,31 +31,13 @@ stdenv.mkDerivation rec {
32 "-Dxcb-icccm=enabled" "-Dxcb-errors=enabled"
31 "-Dxcb-icccm=enabled" "-Dxcb-errors=enabled"
36− # It happens from time to time that the version wasn't updated:
37− sed -iE "s/version: '[0-9]\.[0-9]\.[0-9]'/version: '${version}.0'/" meson.build
40 postInstall = ''
34 postInstall = ''
41− # Copy the library to $bin and $examples
35+ # Copy the library to $examples
42− for output in "$bin" "$examples"; do
43− mkdir -p $output/lib
36+ mkdir -p $examples/lib
44− cp -P libwlroots* $output/lib/
37+ cp -P libwlroots* $examples/lib/
48 postFixup = ''
40 postFixup = ''
49− # Install rootston (the reference compositor) to $bin and $examples (this
50− # has to be done after the fixup phase to prevent broken binaries):
51− for output in "$bin" "$examples"; do
53− cp rootston/rootston $output/bin/
55− --set-rpath "$(patchelf --print-rpath $output/bin/rootston | sed s,$out,$output,g)" \
58− cp ../rootston/rootston.ini.example $output/etc/rootston.ini
60 # Install ALL example programs to $examples:
41 # Install ALL example programs to $examples:
61 # screencopy dmabuf-capture input-inhibitor layer-shell idle-inhibit idle
42 # screencopy dmabuf-capture input-inhibitor layer-shell idle-inhibit idle
62 # screenshot output-layout multi-pointer rotation tablet touch pointer
43 # screenshot output-layout multi-pointer rotation tablet touch pointer
@@ -65,9 +46,6 @@ stdenv.mkDerivation rec {
65 cd ./examples
46 cd ./examples
66 for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do
47 for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do
67 cp "$binary" "$examples/bin/wlroots-$binary"
48 cp "$binary" "$examples/bin/wlroots-$binary"
69− --set-rpath "$(patchelf --print-rpath $output/bin/rootston | sed s,$out,$examples,g)" \
70− "$examples/bin/wlroots-$binary"