diff options
Diffstat (limited to 'pkgs/applications/window-managers')
9 files changed, 128 insertions, 68 deletions
diff --git a/pkgs/applications/window-managers/bspwm/unstable.nix b/pkgs/applications/window-managers/bspwm/unstable.nix new file mode 100644 index 000000000000..7b31c63128a7 --- /dev/null +++ b/pkgs/applications/window-managers/bspwm/unstable.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, libxcb, libXinerama, sxhkd, xcbutil, xcbutilkeysyms, xcbutilwm }: + +stdenv.mkDerivation rec { + name = "bspwm-unstable-2016-09-30"; + + + src = fetchFromGitHub { + owner = "baskerville"; + repo = "bspwm"; + rev = "8664c007e44de162c1597fd7e163635b274fb747"; + sha256 = "0clvpz32z38i8kr10hqlifa661szpfn93c63m2aq2h4dwmr44slz"; + }; + + buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ]; + + buildPhase = '' + make PREFIX=$out + ''; + + installPhase = '' + make PREFIX=$out install + ''; + + meta = { + description = "A tiling window manager based on binary space partitioning (git version)"; + homepage = https://github.com/baskerville/bspwm; + maintainers = [ stdenv.lib.maintainers.meisternu stdenv.lib.maintainers.epitrochoid ]; + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix index 378001528b1f..6c53c51551ac 100644 --- a/pkgs/applications/window-managers/i3/lock-fancy.nix +++ b/pkgs/applications/window-managers/i3/lock-fancy.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { - rev = "b7196aaff72b90bb6ea0464a9f7b37d140db3230"; - name = "i3lock-fancy-2016-05-05_rev${builtins.substring 0 7 rev}"; + rev = "546ce2e71bd2339f2134904c7d22062e86105b46"; + name = "i3lock-fancy-unstable-2016-10-13_rev${builtins.substring 0 7 rev}"; src = fetchFromGitHub { owner = "meskarune"; repo = "i3lock-fancy"; inherit rev; - sha256 = "0az43nqhmbniih3yw9kz5lnky0n7mxylvklsib76s4l2alf6i3ps"; + sha256 = "1pbxydwdfd7jlw3b8cnlwlrkqlyh5jyanfhjybndqmacd3y8vplb"; }; patchPhase = '' sed -i -e "s|(mktemp)|(${coreutils}/bin/mktemp)|" lock @@ -19,15 +19,16 @@ stdenv.mkDerivation rec { sed -i -e "s|awk -F|${gawk}/bin/awk -F|" lock sed -i -e "s| awk | ${gawk}/bin/awk |" lock sed -i -e "s|i3lock -n |${i3lock-color}/bin/i3lock-color -n |" lock - sed -i -e 's|ICON="$SCRIPTPATH/lockdark.png"|ICON="'$out'/share/i3lock-fancy/lockdark.png"|' lock - sed -i -e 's|ICON="$SCRIPTPATH/lock.png"|ICON="'$out'/share/i3lock-fancy/lock.png"|' lock + sed -i -e 's|ICON="$SCRIPTPATH/icons/lockdark.png"|ICON="'$out'/share/i3lock-fancy/icons/lockdark.png"|' lock + sed -i -e 's|ICON="$SCRIPTPATH/icons/lock.png"|ICON="'$out'/share/i3lock-fancy/icons/lock.png"|' lock sed -i -e "s|getopt |${getopt}/bin/getopt |" lock sed -i -e "s|fc-match |${fontconfig.bin}/bin/fc-match |" lock + sed -i -e "s|SHOT=(import -window root)|SHOT=(${scrot}/bin/scrot -z)|" lock ''; installPhase = '' - mkdir -p $out/bin $out/share/i3lock-fancy + mkdir -p $out/bin $out/share/i3lock-fancy/icons cp lock $out/bin/i3lock-fancy - cp lock*.png $out/share/i3lock-fancy + cp icons/lock*.png $out/share/i3lock-fancy/icons ''; meta = with stdenv.lib; { description = "i3lock is a bash script that takes a screenshot of the desktop, blurs the background and adds a lock icon and text."; diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index c3425afd9880..47130ac71ece 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, automake, autoconf, libtool, gettext, which, - xorg, libX11, libXext, libXinerama, libXpm, libXft, libXau, libXdmcp, - libXmu, libpng, libjpeg, expat, xproto, xextproto, xineramaproto, librsvg, - freetype, fontconfig }: +{ stdenv, fetchFromGitHub, pkgconfig, automake, autoconf, libtool, + gettext, which, xorg, libX11, libXext, libXinerama, libXpm, libXft, + libXau, libXdmcp, libXmu, libpng, libjpeg, expat, xproto, xextproto, + xineramaproto, librsvg, freetype, fontconfig }: stdenv.mkDerivation rec { name = "jwm-${version}"; - version = "1548"; + version = "1563"; - src = fetchurl { - url = "https://github.com/joewing/jwm/archive/s${version}.tar.gz"; - sha256 = "1ih5y7567vwcbnkjwm3cc9iq4n9rzz818mkh6ryli9ld230hla5r"; + src = fetchFromGitHub { + owner = "joewing"; + repo = "jwm"; + rev = "s${version}"; + sha256 = "0xfrsk0cffc0fmlmq1340ylzdcmancn2bwgzv6why3gklxplsp9z"; }; nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ]; diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/pkgs/applications/window-managers/lemonbar/default.nix index 042abf09dad2..27cb564d2c6b 100644 --- a/pkgs/applications/window-managers/lemonbar/default.nix +++ b/pkgs/applications/window-managers/lemonbar/default.nix @@ -1,27 +1,22 @@ -{ stdenv, fetchFromGitHub, perl, libxcb }: +{ stdenv, fetchurl, perl, libxcb }: -let - version = "1.2pre"; -in - stdenv.mkDerivation rec { - name = "lemonbar-${version}"; +stdenv.mkDerivation rec { + name = "lemonbar-1.2"; - src = fetchFromGitHub { - owner = "LemonBoy"; - repo = "bar"; - rev = "61985278f2af1e4e85d63a696ffedc5616b06bc0"; - sha256 = "0a8djlayimjdg5fj50lpifsv6gkb577bca68wmk9wg9y9n27pgay"; - }; + src = fetchurl { + url = "https://github.com/LemonBoy/bar/archive/v1.2.tar.gz"; + sha256 = "1smz8lh930bnb6a4lrm07l3z2k071kc8p2pljk5wsrch3x2xhimq"; + }; - buildInputs = [ libxcb perl ]; + buildInputs = [ libxcb perl ]; - prePatch = ''sed -i "s@/usr@$out@" Makefile''; + prePatch = ''sed -i "s@/usr@$out@" Makefile''; - meta = with stdenv.lib; { - description = "A lightweight xcb based bar"; - homepage = https://github.com/LemonBoy/bar; - maintainers = [ maintainers.meisternu ]; - license = "Custom"; - platforms = platforms.linux; - }; + meta = with stdenv.lib; { + description = "A lightweight xcb based bar"; + homepage = https://github.com/LemonBoy/bar; + maintainers = [ maintainers.meisternu ]; + license = "Custom"; + platforms = platforms.linux; + }; } diff --git a/pkgs/applications/window-managers/lemonbar/xft.nix b/pkgs/applications/window-managers/lemonbar/xft.nix index f5dd944a43d2..132c10ae9733 100644 --- a/pkgs/applications/window-managers/lemonbar/xft.nix +++ b/pkgs/applications/window-managers/lemonbar/xft.nix @@ -1,27 +1,24 @@ { stdenv, fetchFromGitHub, perl, libxcb, libXft }: -let - version = "2015-07-23"; -in - stdenv.mkDerivation rec { - name = "bar-xft-git-${version}"; +stdenv.mkDerivation rec { + name = "lemonbar-xft-unstable-2016-02-17"; - src = fetchFromGitHub { - owner = "krypt-n"; - repo = "bar"; - rev = "3020df19232153f9e98ae0c8111db3de938a2719"; - sha256 = "0a54yr534jd4l5gjzpypc0y5lh2qb2wsrd662s84jjgq8bpss8av"; - }; + src = fetchFromGitHub { + owner = "krypt-n"; + repo = "bar"; + rev = "a43b801ddc0f015ce8b1211f4c062fad12cd63a9"; + sha256 = "0iqas07qjvabxyvna2m9aj5bcwnkdii1izl9jxha63vz0zlsc4gd"; + }; - buildInputs = [ libxcb libXft perl ]; + buildInputs = [ libxcb libXft perl ]; - prePatch = ''sed -i "s@/usr@$out@" Makefile''; + prePatch = ''sed -i "s@/usr@$out@" Makefile''; - meta = { - description = "A lightweight xcb based bar with XFT-support"; - homepage = https://github.com/krypt-n/bar; - maintainers = [ stdenv.lib.maintainers.hiberno ]; - license = "Custom"; - platforms = stdenv.lib.platforms.linux; - }; + meta = { + description = "A lightweight xcb based bar with XFT-support"; + homepage = https://github.com/krypt-n/bar; + maintainers = [ stdenv.lib.maintainers.hiberno ]; + license = "Custom"; + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index d170c9b74785..4b9da41b028c 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -31,7 +31,7 @@ python27Packages.buildPythonApplication rec { buildInputs = [ pkgconfig glib libxcb cairo pango python27Packages.xcffib ]; - pythonPath = with python27Packages; [ xcffib cairocffi-xcffib trollius readline]; + pythonPath = with python27Packages; [ xcffib cairocffi-xcffib trollius ]; postInstall = '' wrapProgram $out/bin/qtile \ diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix index e550f9fdd83f..810803866890 100644 --- a/pkgs/applications/window-managers/ratpoison/default.nix +++ b/pkgs/applications/window-managers/ratpoison/default.nix @@ -12,11 +12,19 @@ stdenv.mkDerivation rec { sha256 = "1w502z55vv7zs45l80nsllqh9fvfwjfdfi11xy1qikhzdmirains"; }; + outputs = [ "out" "contrib" "doc" "info" ]; + buildInputs = [ pkgconfig perl autoconf automake libX11 inputproto libXt libXpm libXft libXtst xextproto libXi fontconfig freetype readline ]; + postInstall = '' + mkdir -p $contrib/{bin,share} + mv $out/bin/rpws $contrib/bin + mv $out/share/ratpoison $contrib/share + ''; + meta = with stdenv.lib; { homepage = "http://www.nongnu.org/ratpoison/"; description = "Simple mouse-free tiling window manager"; diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix index f3b19e846101..0f362e02ebf1 100644 --- a/pkgs/applications/window-managers/sawfish/default.nix +++ b/pkgs/applications/window-managers/sawfish/default.nix @@ -1,5 +1,8 @@ -{ stdenv, fetchgit, pkgconfig, which, autoreconfHook, rep-gtk, pango -, gdk_pixbuf, libXinerama, libXrandr, libXtst, imlib, gettext, texinfo +{ stdenv, fetchurl +, pkgconfig, which, autoreconfHook +, rep-gtk, pango, gdk_pixbuf +, imlib, gettext, texinfo +, libXinerama, libXrandr, libXtst, libICE, libSM , makeWrapper }: @@ -8,18 +11,18 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "sawfish-${version}"; - version = "1.11.90"; + version = "1.12.0"; + sourceName = "sawfish_${version}"; - src = fetchgit { - url = "https://github.com/SawfishWM/sawfish.git"; - rev = "b121f832571c9aebd228691c32604146e49f5e55"; - sha256 = "0y7rmjzp7ha5qj9q1dasw50gd6jiaxc0qsjbvyfzxvwssl3i9hsc"; + src = fetchurl { + url = "http://download.tuxfamily.org/sawfish/${sourceName}.tar.xz"; + sha256 = "1z7awzgw8d15aw17kpbj460pcxq8l2rhkaxk47w7yg9qrmg0xja4"; }; - 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 imlib gettext texinfo + libXinerama libXrandr libXtst libICE libSM + makeWrapper ]; patchPhase = '' sed -e 's|REP_DL_LOAD_PATH=|REP_DL_LOAD_PATH=$(REP_DL_LOAD_PATH):|g' -i Makedefs.in diff --git a/pkgs/applications/window-managers/sxhkd/unstable.nix b/pkgs/applications/window-managers/sxhkd/unstable.nix new file mode 100644 index 000000000000..a3379259a8c4 --- /dev/null +++ b/pkgs/applications/window-managers/sxhkd/unstable.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, asciidoc, libxcb, xcbutil, xcbutilkeysyms, xcbutilwm }: + +stdenv.mkDerivation rec { + name = "sxhkd-unstable-2016-08-29"; + + src = fetchFromGitHub { + owner = "baskerville"; + repo = "sxhkd"; + rev = "69b6acc7831bd333b39286c37188e5638ad0de27"; + sha256 = "11i451hz0icsbxnvbq2bdl6r5kacxf6ps0yvi9ix3vkpxn4zcanh"; + }; + + buildInputs = [ asciidoc libxcb xcbutil xcbutilkeysyms xcbutilwm ]; + + makeFlags = ''PREFIX=$(out)''; + + meta = with stdenv.lib; { + description = "Simple X hotkey daemon (git version)"; + inherit (src.meta) homepage; + license = licenses.bsd2; + platforms = platforms.linux; + }; +} |