diff options
Diffstat (limited to 'pkgs/applications/window-managers')
4 files changed, 38 insertions, 33 deletions
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 29b215d06428..181983e48b0d 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -7,7 +7,7 @@ }: let - version = "3.5.8"; + version = "3.5.9"; in with luaPackages; stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz"; - sha256 = "1iifcyphgibmh3cvsy8agjrl9zjl80scrg0bcgnwywmxaxncjc3w"; + sha256 = "0kynair1ykr74b39a4gcm2y24viial64337cf26nhlc7azjbby67"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index f019ba9751b9..adbdef5e2844 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -1,29 +1,30 @@ -{ stdenv, fetchurl, libX11, libXext, libXinerama, libXpm, libXft, freetype, - fontconfig }: +{ stdenv, fetchurl, pkgconfig, automake, autoconf, libtool, which, xorg, + libX11, libXext, libXinerama, libXpm, libXft, libXau, libXdmcp, libpng, + libjpeg, expat, xproto, xextproto, xineramaproto, librsvg, gettext, + freetype, fontconfig }: stdenv.mkDerivation rec { - name = "jwm-2.2.2"; + name = "jwm-${version}"; + version = "1406"; src = fetchurl { - url = "http://www.joewing.net/projects/jwm/releases/${name}.tar.xz"; - sha256 = "0nhyy78c6imk85d47bakk460x0cfhkyghqq82zghmb00dhwiryln"; + url = "https://github.com/joewing/jwm/archive/s${version}.tar.gz"; + sha256 = "0yk22b7cshhyfpcqnb4p59yxspx95xg9yp1kmkxi2fyw95cacab4"; }; - buildInputs = [ libX11 libXext libXinerama libXpm libXft freetype - fontconfig ]; + nativeBuildInputs = [ pkgconfig automake autoconf libtool which ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2 " - export NIX_LDFLAGS="$NIX_LDFLAGS -lXft -lfreetype -lfontconfig " - ''; + buildInputs = [ libX11 libXext libXinerama libXpm libXft xorg.libXrender + libXau libXdmcp libpng libjpeg expat xproto xextproto xineramaproto + librsvg gettext freetype fontconfig ]; - postInstall = - '' - sed -i -e s/rxvt/xterm/g $out/etc/system.jwmrc - sed -i -e "s/.*Swallow.*\|.*xload.*//" $out/etc/system.jwmrc - ''; + preConfigure = "./autogen.sh"; meta = { + homepage = "http://joewing.net/projects/jwm/"; description = "A window manager for X11 that requires only Xlib"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.romildo ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix index 326cd2a49f44..ba0c812ef6a6 100644 --- a/pkgs/applications/window-managers/openbox/default.nix +++ b/pkgs/applications/window-managers/openbox/default.nix @@ -3,7 +3,8 @@ , imlib2, pango, libstartup_notification, makeWrapper }: stdenv.mkDerivation rec { - name = "openbox-3.6.1"; + name = "openbox-${version}"; + version = "3.6.1"; buildInputs = [ pkgconfig libxml2 @@ -40,5 +41,6 @@ stdenv.mkDerivation rec { description = "X window manager for non-desktop embedded systems"; homepage = http://openbox.org/; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index fa81971885a4..7f494f3e0f22 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -1,21 +1,23 @@ -{ lib, stdenv, fetchurl, makeWrapper, cmake, pkgconfig -, wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, asciidoc, libxslt, dbus_libs +{ stdenv, fetchFromGitHub +, makeWrapper, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl +, wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, dbus_libs }: stdenv.mkDerivation rec { name = "sway-${version}"; version = "git-2016-02-08"; - repo = "https://github.com/SirCmpwn/sway"; - rev = "16e904634c65128610537bed7fcb16ac3bb45165"; - src = fetchurl { - url = "${repo}/archive/${rev}.tar.gz"; - sha256 = "52d6c4b49fea69e2a2c1b44b858908b7736301bdb9ed483c294bc54bb40e872e"; + src = fetchFromGitHub { + owner = "Sircmpwn"; + repo = "sway"; + + rev = "16e904634c65128610537bed7fcb16ac3bb45165"; + sha256 = "04qvdjaarglq3qsjbb9crjkad3y1v7s51bk82sl8w26c71jbhklg"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ makeWrapper cmake pkgconfig asciidoc libxslt docbook_xsl ]; - buildInputs = [ makeWrapper wayland wlc libxkbcommon pixman fontconfig pcre json_c asciidoc libxslt dbus_libs ]; + buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs ]; patchPhase = '' sed -i s@/etc/sway@$out/etc/sway@g CMakeLists.txt; @@ -24,17 +26,17 @@ stdenv.mkDerivation rec { makeFlags = "PREFIX=$(out)"; installPhase = "PREFIX=$out make install"; - LD_LIBRARY_PATH = lib.makeLibraryPath [ wlc dbus_libs ]; + LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ wlc dbus_libs ]; preFixup = '' wrapProgram $out/bin/sway \ --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}"; ''; - meta = { + meta = with stdenv.lib; { description = "i3-compatible window manager for Wayland"; homepage = "http://swaywm.org"; - license = lib.licenses.mit; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ]; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ ]; }; } |