diff options
Diffstat (limited to 'pkgs/applications/window-managers')
6 files changed, 84 insertions, 27 deletions
diff --git a/pkgs/applications/window-managers/compton/default.nix b/pkgs/applications/window-managers/compton/default.nix index efa820b0b6a..7efacafd6a1 100644 --- a/pkgs/applications/window-managers/compton/default.nix +++ b/pkgs/applications/window-managers/compton/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig dbus libconfig libdrm libxml2 mesa pcre libXcomposite libXfixes libXdamage libXinerama libXrandr libXrender libXext ]; - buildFlagsArray = ["CFLAGS=-O3 -fomit-frame-pointer"]; installFlags = "PREFIX=$(out)"; meta = with stdenv.lib; { diff --git a/pkgs/applications/window-managers/compton/git.nix b/pkgs/applications/window-managers/compton/git.nix new file mode 100644 index 00000000000..be2586c9e27 --- /dev/null +++ b/pkgs/applications/window-managers/compton/git.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchFromGitHub, asciidoc, dbus, docbook_xml_dtd_45, + docbook_xml_xslt, libconfig, libdrm, libxml2, libxslt, mesa, pcre, + pkgconfig, libXcomposite, libXdamage, libXext, libXfixes, libXinerama, + libXrandr, libXrender }: + +stdenv.mkDerivation { + name = "compton-git-2015-04-20"; + + src = fetchFromGitHub { + owner = "chjj"; + repo = "compton"; + rev = "b1889c1245e6f47eedfae6063100d5a16f584e2b"; + sha256 = "0brnbidxi7wg08yiwgnijzcyqv5lnkd74xzfymvb0i7pgy465vaf"; + }; + + buildInputs = [ + asciidoc + dbus + docbook_xml_dtd_45 + docbook_xml_xslt + libXcomposite + libXdamage + libXext + libXfixes + libXinerama + libXrandr + libXrender + libconfig + libdrm + libxml2 + libxslt + mesa + pcre + pkgconfig + ]; + + installFlags = "PREFIX=$(out)"; + + meta = with stdenv.lib; { + description = + "A fork of XCompMgr, a sample compositing manager for X servers (git version)"; + homepage = https://github.com/chjj/compton/; + license = licenses.mit; + longDescription = '' + A fork of XCompMgr, which is a sample compositing manager for X + servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE + extensions. It enables basic eye-candy effects. This fork adds + additional features, such as additional effects, and a fork at a + well-defined and proper place. + ''; + maintainer = maintainers.ertes; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index a8d2b42bb3b..21836bd4fff 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,14 +1,15 @@ { fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms , xcbutil, xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl -, xcb-util-cursor, coreutils, perl, pango, perlPackages, xdummy, libxkbcommon }: +, xcb-util-cursor, coreutils, perl, pango, perlPackages, libxkbcommon +, xorgserver, xvfb_run }: stdenv.mkDerivation rec { name = "i3-${version}"; - version = "4.9.1"; + version = "4.10.2"; src = fetchurl { url = "http://i3wm.org/downloads/${name}.tar.bz2"; - sha256 = "0hyw2rdxigiklqvv7fbhcdqdxkgcxvx56vk4r5v55l674zqfy3dp"; + sha256 = "1n6grkpv5rsn9zgg8if76mmg85w1asbm3rpplxyn6fzr8wds7587"; }; buildInputs = [ @@ -16,6 +17,7 @@ stdenv.mkDerivation rec { libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC + xorgserver xvfb_run ]; postPatch = '' @@ -26,8 +28,7 @@ stdenv.mkDerivation rec { checkPhase = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") '' - ln -sf "${xdummy}/bin/xdummy" testcases/Xdummy - (cd testcases && perl complete-run.pl -p 1) + (cd testcases && xvfb-run ./complete-run.pl -p 1 --keep-xserver-output) ! grep -q '^not ok' testcases/latest/complete-run.log ''; diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix index bf3367d7843..99562ebd662 100644 --- a/pkgs/applications/window-managers/i3/status.nix +++ b/pkgs/applications/window-managers/i3/status.nix @@ -2,11 +2,11 @@ }: stdenv.mkDerivation rec { - name = "i3status-2.8"; + name = "i3status-2.9"; src = fetchurl { url = "http://i3wm.org/i3status/${name}.tar.bz2"; - sha256 = "1zh7z2qbw0jsrqdkc1irviq2n20mc5hq4h1mckyfcm238pfwa1mb"; + sha256 = "1qwxbrga2fi5wf742hh9ajwa8b2kpzkjjnhjlz4wlpv21i80kss2"; }; buildInputs = [ confuse yajl alsaLib wirelesstools ]; diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix index 4281eb99dd0..f3b19e84610 100644 --- a/pkgs/applications/window-managers/sawfish/default.nix +++ b/pkgs/applications/window-managers/sawfish/default.nix @@ -1,17 +1,25 @@ -{ stdenv, fetchgit, pkgconfig, which, autoreconfHook, rep-gtk, pango, gdk_pixbuf, libXinerama, libXrandr, libXtst, imlib, gettext, texinfo, makeWrapper }: +{ stdenv, fetchgit, pkgconfig, which, autoreconfHook, rep-gtk, pango +, gdk_pixbuf, libXinerama, libXrandr, libXtst, imlib, gettext, texinfo +, makeWrapper +}: with stdenv.lib; + stdenv.mkDerivation rec { - name = "sawfish-git-2015-02-15"; + name = "sawfish-${version}"; + version = "1.11.90"; src = fetchgit { url = "https://github.com/SawfishWM/sawfish.git"; - rev = "44729f44017e6779b4b66a7ecdbd63a98731f668"; - sha256 = "bd3f42f1604f37ecb2515008341cac4f6965840b2d6a6639dd1f3f2459f68e73"; + rev = "b121f832571c9aebd228691c32604146e49f5e55"; + sha256 = "0y7rmjzp7ha5qj9q1dasw50gd6jiaxc0qsjbvyfzxvwssl3i9hsc"; }; - buildInputs = [ pkgconfig which autoreconfHook rep-gtk pango gdk_pixbuf libXinerama libXrandr libXtst imlib gettext texinfo makeWrapper ]; + buildInputs = + [ pkgconfig which autoreconfHook rep-gtk pango gdk_pixbuf libXinerama + libXrandr libXtst imlib gettext texinfo makeWrapper + ]; patchPhase = '' sed -e 's|REP_DL_LOAD_PATH=|REP_DL_LOAD_PATH=$(REP_DL_LOAD_PATH):|g' -i Makedefs.in @@ -25,7 +33,7 @@ stdenv.mkDerivation rec { --set REP_LOAD_PATH "$out/share/sawfish/lisp" done ''; - + meta = { description = "An extensible, Lisp-based window manager"; longDescription = '' diff --git a/pkgs/applications/window-managers/sxhkd/default.nix b/pkgs/applications/window-managers/sxhkd/default.nix index af368d0a042..f9165e0bbd4 100644 --- a/pkgs/applications/window-managers/sxhkd/default.nix +++ b/pkgs/applications/window-managers/sxhkd/default.nix @@ -1,26 +1,21 @@ { stdenv, fetchurl, asciidoc, libxcb, xcbutil, xcbutilkeysyms, xcbutilwm }: stdenv.mkDerivation rec { - name = "sxhkd-0.5.4"; - + name = "sxhkd-${version}"; + version = "0.5.5"; + src = fetchurl { - url = "https://github.com/baskerville/sxhkd/archive/0.5.4.tar.gz"; - sha256 = "de95f97155319ded41ece9403ac9e9f18bfdd914a09f553ab09b331bbfe5d332"; + url = "https://github.com/baskerville/sxhkd/archive/${version}.tar.gz"; + sha256 = "04s3y2bq9502gw72jj3y2zsh96yj3qg2av3zsa8ahd2farvrysg6"; }; - - buildInputs = [ asciidoc libxcb xcbutil xcbutilkeysyms xcbutilwm ]; - buildPhase = '' - make PREFIX=$out - ''; + buildInputs = [ asciidoc libxcb xcbutil xcbutilkeysyms xcbutilwm ]; - installPhase = '' - make PREFIX=$out install - ''; + makeFlags = ''PREFIX=$(out)''; meta = { description = "Simple X hotkey daemon"; - homepage = "http://github.com/baskerville/sxhkd"; + homepage = http://github.com/baskerville/sxhkd/; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; }; |