diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2019-08-27 12:17:53 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-27 12:17:53 +0200 |
commit | db2b048aecd9abb03892b1faa480e9d5ac88b269 (patch) | |
tree | 859e5b68c2f4b22ddbe852ae894be54f8988e703 /pkgs | |
parent | 5026c1ef698936f5f95053e8a034c32ef0c44ff6 (diff) | |
parent | d861196c618f56d9bc4b6688d9df0a83e945fc23 (diff) | |
download | nixlib-db2b048aecd9abb03892b1faa480e9d5ac88b269.tar nixlib-db2b048aecd9abb03892b1faa480e9d5ac88b269.tar.gz nixlib-db2b048aecd9abb03892b1faa480e9d5ac88b269.tar.bz2 nixlib-db2b048aecd9abb03892b1faa480e9d5ac88b269.tar.lz nixlib-db2b048aecd9abb03892b1faa480e9d5ac88b269.tar.xz nixlib-db2b048aecd9abb03892b1faa480e9d5ac88b269.tar.zst nixlib-db2b048aecd9abb03892b1faa480e9d5ac88b269.zip |
Merge pull request #67554 from primeos/sway
wlroots: 0.6.0 -> 0.7.0, sway: 1.1.1 -> 1.2
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/window-managers/sway/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/wlroots/default.nix | 36 |
2 files changed, 9 insertions, 35 deletions
diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 12427b912654..215a576a578c 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "sway"; - version = "1.1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = version; - sha256 = "0yhn9zdg9mzfhn97c440lk3pw6122nrhx0is5sqmvgr6p814f776"; + sha256 = "0vch2zm5afc76ia78p3vg71zr2fyda67l9hd2h0x1jq3mnvfbxnd"; }; patches = [ @@ -41,10 +41,6 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/sway --prefix PATH : "${swaybg}/bin" ''; - postPatch = '' - sed -i "s/version: '1.0'/version: '${version}'/" meson.build - ''; - meta = with stdenv.lib; { description = "i3-compatible tiling Wayland compositor"; homepage = https://swaywm.org; diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index b85616842ea6..4d820bd95198 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -6,18 +6,17 @@ stdenv.mkDerivation rec { pname = "wlroots"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "swaywm"; repo = "wlroots"; rev = version; - sha256 = "1rdcmll5b8w242n6yfjpsaprq280ck2jmbz46dxndhignxgda7k4"; + sha256 = "0jzxa6psbc7ddxli7rbfqxmv1svxnis51l1vch4hb9fdixqm284a"; }; - # $out for the library, $bin for rootston, and $examples for the example - # programs (in examples) AND rootston - outputs = [ "out" "bin" "examples" ]; + # $out for the library and $examples for the example programs (in examples): + outputs = [ "out" "examples" ]; nativeBuildInputs = [ meson ninja pkgconfig ]; @@ -32,31 +31,13 @@ stdenv.mkDerivation rec { "-Dxcb-icccm=enabled" "-Dxcb-errors=enabled" ]; - postPatch = '' - # It happens from time to time that the version wasn't updated: - sed -iE "s/version: '[0-9]\.[0-9]\.[0-9]'/version: '${version}.0'/" meson.build - ''; - postInstall = '' - # Copy the library to $bin and $examples - for output in "$bin" "$examples"; do - mkdir -p $output/lib - cp -P libwlroots* $output/lib/ - done + # Copy the library to $examples + mkdir -p $examples/lib + cp -P libwlroots* $examples/lib/ ''; postFixup = '' - # Install rootston (the reference compositor) to $bin and $examples (this - # has to be done after the fixup phase to prevent broken binaries): - for output in "$bin" "$examples"; do - mkdir -p $output/bin - cp rootston/rootston $output/bin/ - patchelf \ - --set-rpath "$(patchelf --print-rpath $output/bin/rootston | sed s,$out,$output,g)" \ - $output/bin/rootston - mkdir $output/etc - cp ../rootston/rootston.ini.example $output/etc/rootston.ini - done # Install ALL example programs to $examples: # screencopy dmabuf-capture input-inhibitor layer-shell idle-inhibit idle # screenshot output-layout multi-pointer rotation tablet touch pointer @@ -65,9 +46,6 @@ stdenv.mkDerivation rec { cd ./examples for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do cp "$binary" "$examples/bin/wlroots-$binary" - patchelf \ - --set-rpath "$(patchelf --print-rpath $output/bin/rootston | sed s,$out,$examples,g)" \ - "$examples/bin/wlroots-$binary" done ''; |