git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #67554 from primeos/sway

wlroots: 0.6.0 -> 0.7.0, sway: 1.1.1 -> 1.2

commitdb2b048aecd9abb03892b1faa480e9d5ac88b269 authorMichael Weiss <dev.primeos@gmail.com> dateTue 27 Aug 2019, 12:17 (7 years ago) parent5026c1ed861196
2 files changed+9−35
pkgs/applications/window-managers/sway/default.nix+2−6 pkgs/development/libraries/wlroots/default.nix+7−29
pkgs/applications/window-managers/sway/default.nix+2−6
@@ -8,13 +8,13 @@
88
99stdenv.mkDerivation rec {
1010 pname = "sway";
11− version = "1.1.1";
11+ version = "1.2";
1212
1313 src = fetchFromGitHub {
1414 owner = "swaywm";
1515 repo = "sway";
1616 rev = version;
17− sha256 = "0yhn9zdg9mzfhn97c440lk3pw6122nrhx0is5sqmvgr6p814f776";
17+ sha256 = "0vch2zm5afc76ia78p3vg71zr2fyda67l9hd2h0x1jq3mnvfbxnd";
1818 };
1919
2020 patches = [
@@ -41,10 +41,6 @@ stdenv.mkDerivation rec {
4141 wrapProgram $out/bin/sway --prefix PATH : "${swaybg}/bin"
4242 '';
4343
44− postPatch = ''
45− sed -i "s/version: '1.0'/version: '${version}'/" meson.build
46− '';
47−
4844 meta = with stdenv.lib; {
4945 description = "i3-compatible tiling Wayland compositor";
5046 homepage = https://swaywm.org;
pkgs/development/libraries/wlroots/default.nix+7−29
@@ -6,18 +6,17 @@
66
77stdenv.mkDerivation rec {
88 pname = "wlroots";
9− version = "0.6.0";
9+ version = "0.7.0";
1010
1111 src = fetchFromGitHub {
1212 owner = "swaywm";
1313 repo = "wlroots";
1414 rev = version;
15− sha256 = "1rdcmll5b8w242n6yfjpsaprq280ck2jmbz46dxndhignxgda7k4";
15+ sha256 = "0jzxa6psbc7ddxli7rbfqxmv1svxnis51l1vch4hb9fdixqm284a";
1616 };
1717
18− # $out for the library, $bin for rootston, and $examples for the example
19− # programs (in examples) AND rootston
20− outputs = [ "out" "bin" "examples" ];
18+ # $out for the library and $examples for the example programs (in examples):
19+ outputs = [ "out" "examples" ];
2120
2221 nativeBuildInputs = [ meson ninja pkgconfig ];
2322
@@ -32,31 +31,13 @@ stdenv.mkDerivation rec {
3231 "-Dxcb-icccm=enabled" "-Dxcb-errors=enabled"
3332 ];
3433
35− postPatch = ''
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
38− '';
39−
4034 postInstall = ''
41− # Copy the library to $bin and $examples
42− for output in "$bin" "$examples"; do
43− mkdir -p $output/lib
44− cp -P libwlroots* $output/lib/
45− done
35+ # Copy the library to $examples
36+ mkdir -p $examples/lib
37+ cp -P libwlroots* $examples/lib/
4638 '';
4739
4840 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
52− mkdir -p $output/bin
53− cp rootston/rootston $output/bin/
54− patchelf \
55− --set-rpath "$(patchelf --print-rpath $output/bin/rootston | sed s,$out,$output,g)" \
56− $output/bin/rootston
57− mkdir $output/etc
58− cp ../rootston/rootston.ini.example $output/etc/rootston.ini
59− done
6041 # Install ALL example programs to $examples:
6142 # screencopy dmabuf-capture input-inhibitor layer-shell idle-inhibit idle
6243 # screenshot output-layout multi-pointer rotation tablet touch pointer
@@ -65,9 +46,6 @@ stdenv.mkDerivation rec {
6546 cd ./examples
6647 for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do
6748 cp "$binary" "$examples/bin/wlroots-$binary"
68− patchelf \
69− --set-rpath "$(patchelf --print-rpath $output/bin/rootston | sed s,$out,$examples,g)" \
70− "$examples/bin/wlroots-$binary"
7149 done
7250 '';
7351