summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMichael Weiss <dev.primeos@gmail.com>2019-02-11 19:16:28 +0100
committerMichael Weiss <dev.primeos@gmail.com>2019-02-11 19:30:52 +0100
commit1a88aa9e0cdcbc12acc5cbdc379c0804d208e913 (patch)
tree6386d07e1cd4ff1efd17a284f2eb9f138c3f631f /pkgs
parent8eadf8d706931753e0b352501954fe2290a18053 (diff)
downloadnixpkgs-1a88aa9e0cdcbc12acc5cbdc379c0804d208e913.tar
nixpkgs-1a88aa9e0cdcbc12acc5cbdc379c0804d208e913.tar.gz
nixpkgs-1a88aa9e0cdcbc12acc5cbdc379c0804d208e913.tar.bz2
nixpkgs-1a88aa9e0cdcbc12acc5cbdc379c0804d208e913.tar.lz
nixpkgs-1a88aa9e0cdcbc12acc5cbdc379c0804d208e913.tar.xz
nixpkgs-1a88aa9e0cdcbc12acc5cbdc379c0804d208e913.tar.zst
nixpkgs-1a88aa9e0cdcbc12acc5cbdc379c0804d208e913.zip
sway-beta: 1.0-rc1 -> 1.0-rc2
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/window-managers/sway/beta.nix12
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/applications/window-managers/sway/beta.nix b/pkgs/applications/window-managers/sway/beta.nix
index 8b2acc94ea0..96e919df5a6 100644
--- a/pkgs/applications/window-managers/sway/beta.nix
+++ b/pkgs/applications/window-managers/sway/beta.nix
@@ -10,15 +10,19 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "sway";
-  version = "1.0-rc1";
+  version = "1.0-rc2";
 
   src = fetchFromGitHub {
     owner = "swaywm";
     repo = "sway";
     rev = version;
-    sha256 = "1zigx2yz0i91iz2r2l6csq33hscaybmaq1p19jgxrazms7z213mz";
+    sha256 = "052if3nagmwg5zh79nhrq75fbc9v2x950lcs1mal52p801qiv8f1";
   };
 
+  postPatch = ''
+    sed -iE "s/version: '1.0',/version: '${version}',/" meson.build
+  '';
+
   nativeBuildInputs = [
     pkgconfig meson ninja
   ] ++ stdenv.lib.optional buildDocs scdoc;
@@ -32,8 +36,8 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   mesonFlags = [
-    "-Dsway-version=${version}" "-Dxwayland=enabled" "-Dgdk-pixbuf=enabled"
-    "-Dman-pages=enabled" "-Dtray=enabled"
+    "-Dxwayland=enabled" "-Dgdk-pixbuf=enabled" "-Dman-pages=enabled"
+    "-Dtray=enabled"
   ];
 
   meta = with stdenv.lib; {