about summary refs log tree commit diff
path: root/pkgs/applications/window-managers
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-08-27 16:36:47 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2019-08-27 16:36:47 +0200
commit98640fd48212f8e6552517f667bba1901f5936d4 (patch)
tree0b5f895f31f16b47e8f837c1d3ac87da1f2884eb /pkgs/applications/window-managers
parent70c1c856d4c96fb37b6e507db4acb125656f992d (diff)
parentb40ee8268515d78b419f53fb22a9fad49b985de8 (diff)
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/window-managers')
-rw-r--r--pkgs/applications/window-managers/sway/default.nix8
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
index 12427b9126544..215a576a578c1 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;