summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2016-06-01 19:35:49 +0100
committerDomen Kožar <domen@dev.si>2016-06-01 19:35:49 +0100
commit8a63f7e067a6dfa4e5c34a691aca89d1674c5b95 (patch)
tree257b4633c553957d1193b4de370de8f823f6c9f9 /pkgs/applications
parent473782b514693cc94630088dc6d05e8043c9ee5a (diff)
downloadnixpkgs-8a63f7e067a6dfa4e5c34a691aca89d1674c5b95.tar
nixpkgs-8a63f7e067a6dfa4e5c34a691aca89d1674c5b95.tar.gz
nixpkgs-8a63f7e067a6dfa4e5c34a691aca89d1674c5b95.tar.bz2
nixpkgs-8a63f7e067a6dfa4e5c34a691aca89d1674c5b95.tar.lz
nixpkgs-8a63f7e067a6dfa4e5c34a691aca89d1674c5b95.tar.xz
nixpkgs-8a63f7e067a6dfa4e5c34a691aca89d1674c5b95.tar.zst
nixpkgs-8a63f7e067a6dfa4e5c34a691aca89d1674c5b95.zip
sway: 2016-02-08 -> 0.7
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/window-managers/sway/default.nix13
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
index 7f494f3e0f2..81fbedc4917 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -1,23 +1,22 @@
-{ stdenv, fetchFromGitHub
-, makeWrapper, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl
+{ stdenv, fetchFromGitHub, pango, libinput
+, makeWrapper, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl, cairo
 , wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, dbus_libs
 }:
 
 stdenv.mkDerivation rec {
   name = "sway-${version}";
-  version = "git-2016-02-08";
+  version = "0.7";
 
   src = fetchFromGitHub {
     owner = "Sircmpwn";
     repo = "sway";
-
-    rev = "16e904634c65128610537bed7fcb16ac3bb45165";
-    sha256 = "04qvdjaarglq3qsjbb9crjkad3y1v7s51bk82sl8w26c71jbhklg";
+    rev = "0.7";
+    sha256 = "05mn68brqz7j3a1sb5xd3pxzzdd8swnhw2g7cc9f7rdjr5dlrjip";
   };
 
   nativeBuildInputs = [ makeWrapper cmake pkgconfig asciidoc libxslt docbook_xsl ];
 
-  buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs ];
+  buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput ];
 
   patchPhase = ''
     sed -i s@/etc/sway@$out/etc/sway@g CMakeLists.txt;