diff options
Diffstat (limited to 'pkgs/applications/window-managers')
11 files changed, 151 insertions, 20 deletions
diff --git a/pkgs/applications/window-managers/compton/default.nix b/pkgs/applications/window-managers/compton/default.nix index e5faf084a42d..138451656667 100644 --- a/pkgs/applications/window-managers/compton/default.nix +++ b/pkgs/applications/window-managers/compton/default.nix @@ -42,10 +42,12 @@ let }; }); - stableSource = { + stableSource = rec { pname = "compton"; version = "0.1_beta2.5"; + COMPTON_VERSION = version; + src = fetchFromGitHub { owner = "chjj"; repo = "compton"; @@ -58,15 +60,17 @@ let }; }; - gitSource = { + gitSource = rec { pname = "compton-git"; - version = "2018-08-14"; + version = "2"; + + COMPTON_VERSION = "v${version}"; src = fetchFromGitHub { owner = "yshui"; repo = "compton"; - rev = "cac8094ce12cd40706fb48f9ab35354d9ee7c48f"; - sha256 = "0qif3nx8vszlr06bixasna13pzfaikp86xax9miwnba50517y7v5"; + rev = COMPTON_VERSION; + sha256 = "1b6jgkkjbmgm7d7qjs94h722kgbqjagcxznkh2r84hcmcl8pibjq"; }; meta = { diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/applications/window-managers/fbpanel/default.nix index b521240b48f5..0c13691a36ac 100644 --- a/pkgs/applications/window-managers/fbpanel/default.nix +++ b/pkgs/applications/window-managers/fbpanel/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { description = "A stand-alone panel"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; + license = licenses.mit; }; passthru = { diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index fa1ddcf810b7..8c775833c28a 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -1,22 +1,22 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxcb, xcbutilkeysyms , xcbutilimage, pam, libX11, libev, cairo, libxkbcommon, - libxkbfile, libjpeg_turbo + libxkbfile, libjpeg_turbo, xcbutilxrm }: stdenv.mkDerivation rec { - version = "2.11-c"; + version = "2.12.c"; name = "i3lock-color-${version}"; src = fetchFromGitHub { owner = "PandorasFox"; repo = "i3lock-color"; rev = version; - sha256 = "1myq9fazkwd776agrnj27bm5nwskvss9v9a5qb77n037dv8d0rdw"; + sha256 = "08fhnchf187b73h52xgzb86g6byzxz085zs9galsvl687g5zxk34"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libxcb xcbutilkeysyms xcbutilimage pam libX11 - libev cairo libxkbcommon libxkbfile libjpeg_turbo ]; + libev cairo libxkbcommon libxkbfile libjpeg_turbo xcbutilxrm ]; makeFlags = "all"; preInstall = '' diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 11b7c49f5ebe..0e3168a5782d 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -1,21 +1,21 @@ -{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, dbus, gperftools }: +{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, dbus }: rustPlatform.buildRustPackage rec { name = "i3status-rust-${version}"; - version = "0.9.0.2018-06-22"; + version = "0.9.0.2018-10-02"; src = fetchFromGitHub { owner = "greshake"; repo = "i3status-rust"; - rev = "fdca01e88a7ce9bf4de0f58a922de5131e33dd00"; - sha256 = "12dfvamf9a13b3fa7mqrwhjk3rl53463h03arqd8pvbch006hhqd"; + rev = "11c2a21693ffcd0b6c2e0ac919b2232918293963"; + sha256 = "019m9qpw7djq6g7lzbm7gjcavlgsp93g3cd7cb408nxnfsi7i9dp"; }; - cargoSha256 = "01pwknfzkv49cip6asqd4pzkh9l42v06abyd9lb09ip5pkcs60lq"; + cargoSha256 = "1wnify730f7c3cb8wllqvs7pzrq54g5x81xspvz5gq0iqr0q38zc"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dbus gperftools ]; + buildInputs = [ dbus ]; meta = with stdenv.lib; { description = "Very resource-friendly and feature-rich replacement for i3status"; diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix new file mode 100644 index 000000000000..546589623cbd --- /dev/null +++ b/pkgs/applications/window-managers/i3/wmfocus.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, rustPlatform, + xorg, python3, pkgconfig, cairo, libxkbcommon }: +let + pname = "wmfocus"; + version = "1.0.2"; +in +rustPlatform.buildRustPackage { + inherit pname version; + name = "${pname}-${version}"; + + nativeBuildInputs = [ python3 pkgconfig ]; + buildInputs = [ cairo libxkbcommon xorg.xcbutilkeysyms ]; + + # For now, this is the only available featureset. This is also why the file is + # in the i3 folder, even though it might be useful for more than just i3 + # users. + cargoBuildFlags = ["--features i3"]; + + src = fetchFromGitHub { + owner = "svenstaro"; + repo = pname; + rev = version; + sha256 = "14yxg2jiqx7gng677sbmvv0a0msb9wpvp3qh8h3nkq0vi17ds668"; + }; + + cargoSha256 = "0lwzw8gf970ybblaxxkwn3pxrncxp0hhvykffbzirs7fic4fnvsg"; + + meta = with stdenv.lib; { + description = '' + Tool that allows you to rapidly choose a specific window directly + without having to use the mouse or directional keyboard navigation. + ''; + maintainers = with maintainers; [ synthetica ]; + platforms = platforms.linux; + license = licenses.mit; + homepage = https://github.com/svenstaro/wmfocus; + }; +} diff --git a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix new file mode 100644 index 000000000000..3b764e7095be --- /dev/null +++ b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, libXpm, libGL, fltk, hicolor-icon-theme, glib, gnome2, which }: + +stdenv.mkDerivation rec { + name = "jwm-settings-manager-${version}"; + version = "2018-10-19"; + + src = fetchFromGitHub { + owner = "Israel-D"; + repo = "jwm-settings-manager"; + rev = "cb32a70563cf1f3927339093481542b85ec3c8c8"; + sha256 = "0d5bqf74p8zg8azns44g46q973blhmp715k8kcd73x88g7sfir8s"; + }; + + nativeBuildInputs = [ + cmake + pkgconfig + gettext + ]; + + buildInputs = [ + libXpm + libGL + fltk + hicolor-icon-theme + which # needed at runtime to locate optional programs + glib.bin # provides gsettings + gnome2.GConf # provides gconftool-2 + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace 'CMAKE_INSTALL_PREFIX "/usr"' "CMAKE_INSTALL_PREFIX $out" + substituteInPlace data/CMakeLists.txt \ + --replace 'DESTINATION usr/share' "DESTINATION share" + ''; + + meta = with stdenv.lib; { + description = "A full configuration manager for JWM"; + homepage = https://joewing.net/projects/jwm; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix index 13eef1c045a4..2681d31ccb1e 100644 --- a/pkgs/applications/window-managers/oroborus/default.nix +++ b/pkgs/applications/window-managers/oroborus/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { version = "2.0.20"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ freetype fribidi libSM libICE libXt libXaw libXmu libXext libXft libXpm libXrandr libXrender xextproto libXinerama ]; + buildInputs = [ freetype fribidi libSM libICE libXt libXaw libXmu libXext + libXft libXpm libXrandr libXrender xextproto libXinerama ]; src = fetchurl { url = "http://ftp.debian.org/debian/pool/main/o/oroborus/oroborus_${version}.tar.gz"; diff --git a/pkgs/applications/window-managers/pekwm/default.nix b/pkgs/applications/window-managers/pekwm/default.nix index bdf914fbd751..b2677218e856 100644 --- a/pkgs/applications/window-managers/pekwm/default.nix +++ b/pkgs/applications/window-managers/pekwm/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { appear as they should when starting applications. - Chainable Keygrabber, usability for everyone. ''; - homepage = https://www.pekwm.org; + homepage = http://www.pekwm.org; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/sway/beta.nix b/pkgs/applications/window-managers/sway/beta.nix new file mode 100644 index 000000000000..5aebb7ed8dd1 --- /dev/null +++ b/pkgs/applications/window-managers/sway/beta.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub +, meson, ninja +, pkgconfig, scdoc +, wayland, libxkbcommon, pcre, json_c, dbus +, pango, cairo, libinput, libcap, pam, gdk_pixbuf +, wlroots, wayland-protocols +, buildDocs ? true +}: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "sway"; + version = "1.0-beta.1"; + + src = fetchFromGitHub { + owner = "swaywm"; + repo = "sway"; + rev = version; + sha256 = "0h9kgrg9mh2acks63z72bw3lwff32pf2nb4i7i5xhd9i6l4gfnqa"; + }; + + nativeBuildInputs = [ + pkgconfig meson ninja + ] ++ stdenv.lib.optional buildDocs scdoc; + + buildInputs = [ + wayland libxkbcommon pcre json_c dbus + pango cairo libinput libcap pam gdk_pixbuf + wlroots wayland-protocols + ]; + + enableParallelBuilding = true; + + mesonFlags = "-Dsway-version=${version}"; + + meta = with stdenv.lib; { + description = "i3-compatible window manager for Wayland"; + homepage = https://swaywm.org; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos synthetica ]; # Trying to keep it up-to-date. + }; +} diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 50614534f8e7..fb30f0073bfd 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "i3-compatible window manager for Wayland"; - homepage = http://swaywm.org; + homepage = https://swaywm.org; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; # Trying to keep it up-to-date. diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix index 96f742df3105..57f00887103f 100644 --- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus-glib -, desktopSupport, xlibs +, desktopSupport, xorg , gtk2 , gtk3, gnome3, mate , libxfce4util, xfce4-panel @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "042307grf4zvn61gnflhsj5xsjykrk9sjjsprprm4iij0qpybxcw"; }; - buildInputs = [ glib dbus-glib xlibs.xcbutilwm ] + buildInputs = [ glib dbus-glib xorg.xcbutilwm ] ++ stdenv.lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome3.gnome-panel ] ++ stdenv.lib.optionals (desktopSupport == "mate") [ gtk3 mate.mate-panel ] ++ stdenv.lib.optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ] |