git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #67554 from primeos/sway
db2b048Michael Weiss
pkgs/applications/window-managers/sway/default.nix+2−6
@@ -8,13 +8,13 @@
8
8
9stdenv.mkDerivation rec {
9stdenv.mkDerivation rec {
10 pname = "sway";
10 pname = "sway";
11− version = "1.1.1";
11+ version = "1.2";
12
12
13 src = fetchFromGitHub {
13 src = fetchFromGitHub {
14 owner = "swaywm";
14 owner = "swaywm";
15 repo = "sway";
15 repo = "sway";
16 rev = version;
16 rev = version;
17− sha256 = "0yhn9zdg9mzfhn97c440lk3pw6122nrhx0is5sqmvgr6p814f776";
17+ sha256 = "0vch2zm5afc76ia78p3vg71zr2fyda67l9hd2h0x1jq3mnvfbxnd";
18 };
18 };
19
19
20 patches = [
20 patches = [
@@ -41,10 +41,6 @@ stdenv.mkDerivation rec {
41 wrapProgram $out/bin/sway --prefix PATH : "${swaybg}/bin"
41 wrapProgram $out/bin/sway --prefix PATH : "${swaybg}/bin"
42 '';
42 '';
43
43
44− postPatch = ''
45− sed -i "s/version: '1.0'/version: '${version}'/" meson.build
46− '';
47−
48 meta = with stdenv.lib; {
44 meta = with stdenv.lib; {
49 description = "i3-compatible tiling Wayland compositor";
45 description = "i3-compatible tiling Wayland compositor";
50 homepage = https://swaywm.org;
46 homepage = https://swaywm.org;
pkgs/development/libraries/wlroots/default.nix+7−29
@@ -6,18 +6,17 @@
6
6
7stdenv.mkDerivation rec {
7stdenv.mkDerivation rec {
8 pname = "wlroots";
8 pname = "wlroots";
9− version = "0.6.0";
9+ version = "0.7.0";
10
10
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";
16 };
16 };
17
17
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" ];
21
20
22 nativeBuildInputs = [ meson ninja pkgconfig ];
21 nativeBuildInputs = [ meson ninja pkgconfig ];
23
22
@@ -32,31 +31,13 @@ stdenv.mkDerivation rec {
32 "-Dxcb-icccm=enabled" "-Dxcb-errors=enabled"
31 "-Dxcb-icccm=enabled" "-Dxcb-errors=enabled"
33 ];
32 ];
34
33
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−
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/
45− done
46 '';
38 '';
47
39
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
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
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"
68− patchelf \
69− --set-rpath "$(patchelf --print-rpath $output/bin/rootston | sed s,$out,$examples,g)" \
70− "$examples/bin/wlroots-$binary"
71 done
49 done
72 '';
50 '';
73
51