diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-03-05 00:39:18 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-05 00:39:18 +0000 |
commit | f696c7c887d5423ffe00e8c040b9734113d6b112 (patch) | |
tree | 54c26f4cb6803ebb4b2fe9bc28f99b8f6c390b91 /pkgs/applications/window-managers | |
parent | 6d1958ad2dda67aa4f667d2283781949c8d18303 (diff) | |
parent | 75d6dd33bfbbbfe43743211e85777af7e962935d (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/window-managers')
-rw-r--r-- | pkgs/applications/window-managers/icewm/default.nix | 21 | ||||
-rw-r--r-- | pkgs/applications/window-managers/sawfish/default.nix | 76 |
2 files changed, 64 insertions, 33 deletions
diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index 571c13e946194..8f1a920296ae2 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , cmake , pkg-config -, perl , asciidoc , expat , fontconfig @@ -34,21 +34,26 @@ , libxcb , mkfontdir , pcre +, perl }: stdenv.mkDerivation rec { pname = "icewm"; - version = "2.1.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "bbidulock"; repo = pname; rev = version; - sha256 = "sha256-n9mLD1WrHsO9W1rxopFQENxQEHp/sxuixV3PxLp2vOY="; + hash = "sha256-STM8t311lf0xIqs2Onmwg48xgE7V9VZrUfJrUzYRxL4="; }; - nativeBuildInputs = [ cmake pkg-config perl asciidoc ]; - + nativeBuildInputs = [ + asciidoc + cmake + perl + pkg-config + ]; buildInputs = [ expat fontconfig @@ -90,6 +95,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + homepage = "https://www.ice-wm.org/"; description = "A simple, lightweight X window manager"; longDescription = '' IceWM is a window manager for the X Window System. The goal of IceWM is @@ -104,8 +110,7 @@ stdenv.mkDerivation rec { includes an optional external background wallpaper manager with transparency support, a simple session manager and a system tray. ''; - homepage = "https://www.ice-wm.org/"; - license = licenses.lgpl2; + license = licenses.lgpl2Only; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix index 7615c6c4bd80d..cb76f0c465ccd 100644 --- a/pkgs/applications/window-managers/sawfish/default.nix +++ b/pkgs/applications/window-managers/sawfish/default.nix @@ -1,20 +1,23 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl -, pkg-config -, which , autoreconfHook -, rep-gtk -, pango , gdk-pixbuf-xlib -, imlib , gettext -, texinfo +, gtk2 +, imlib +, libICE +, libSM , libXinerama , libXrandr , libXtst -, libICE -, libSM +, librep , makeWrapper +, pango +, pkg-config +, rep-gtk +, texinfo +, which }: stdenv.mkDerivation rec { @@ -26,20 +29,42 @@ stdenv.mkDerivation rec { sha256 = "18p8srqqj9vjffg13qhspfz2gr1h4vfs10qzlv89g76r289iam31"; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ which - rep-gtk pango gdk-pixbuf-xlib imlib gettext texinfo - libXinerama libXrandr libXtst libICE libSM - makeWrapper ]; + nativeBuildInputs = [ + autoreconfHook + gettext + librep + makeWrapper + pkg-config + texinfo + which + ]; + buildInputs = [ + gdk-pixbuf-xlib + gtk2 + imlib + libICE + libSM + libXinerama + libXrandr + libXtst + librep + pango + rep-gtk + ]; - patchPhase = '' + postPatch = '' sed -e 's|REP_DL_LOAD_PATH=|REP_DL_LOAD_PATH=$(REP_DL_LOAD_PATH):|g' -i Makedefs.in sed -e 's|$(repexecdir)|$(libdir)/rep|g' -i src/Makefile.in ''; + strictDeps = true; + postInstall = '' - for i in $out/lib/sawfish/sawfish-menu $out/bin/sawfish-about \ - $out/bin/sawfish-client $out/bin/sawfish-config $out/bin/sawfish; do + for i in $out/lib/sawfish/sawfish-menu \ + $out/bin/sawfish-about \ + $out/bin/sawfish-client \ + $out/bin/sawfish-config \ + $out/bin/sawfish; do wrapProgram $i \ --prefix REP_DL_LOAD_PATH : "$out/lib/rep" \ --set REP_LOAD_PATH "$out/share/sawfish/lisp" @@ -47,16 +72,17 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + homepage = "http://sawfish.tuxfamily.org/"; description = "An extensible, Lisp-based window manager"; longDescription = '' - Sawfish is an extensible window manager using a Lisp-based scripting language. - Its policy is very minimal compared to most window managers. Its aim is simply - to manage windows in the most flexible and attractive manner possible. - All high-level WM functions are implemented in Lisp for future extensibility - or redefinition. + Sawfish is an extensible window manager using a Lisp-based scripting + language. Its policy is very minimal compared to most window managers. Its + aim is simply to manage windows in the most flexible and attractive manner + possible. All high-level WM functions are implemented in Lisp for future + extensibility or redefinition. ''; - homepage = "https://sawfish.fandom.com/wiki/Main_Page"; - license = licenses.gpl2; - maintainers = [ maintainers.AndersonTorres ]; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; }; } |