diff options
author | Anderson Torres <torres.anderson.85@protonmail.com> | 2020-11-20 12:12:43 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-20 12:12:43 -0300 |
commit | ead04a66392bccddd77effe9d46ca3b7e0e06d95 (patch) | |
tree | 018b8f9400f9f66610e1febc73a6776a56114b6b /pkgs/applications/window-managers | |
parent | 86233bdfddfc1cf8c302f68738205daab4df78db (diff) | |
parent | c56cde86ca3b6faebf59a147a682ccadb67aca1b (diff) |
Merge pull request #104316 from AndersonTorres/at1985-update
Diffstat (limited to 'pkgs/applications/window-managers')
-rw-r--r-- | pkgs/applications/window-managers/berry/default.nix | 24 | ||||
-rw-r--r-- | pkgs/applications/window-managers/sawfish/default.nix | 36 |
2 files changed, 40 insertions, 20 deletions
diff --git a/pkgs/applications/window-managers/berry/default.nix b/pkgs/applications/window-managers/berry/default.nix index 2a41a3d3c073..367d0214129c 100644 --- a/pkgs/applications/window-managers/berry/default.nix +++ b/pkgs/applications/window-managers/berry/default.nix @@ -1,18 +1,30 @@ -{ stdenv, fetchFromGitHub -, libX11, libXft, libXinerama, fontconfig, freetype }: +{ stdenv +, fetchFromGitHub +, libX11 +, libXft +, libXinerama +, fontconfig +, freetype +}: stdenv.mkDerivation rec { pname = "berry"; - version = "0.1.5"; + version = "0.1.7"; src = fetchFromGitHub { owner = "JLErvin"; - repo = "berry"; + repo = pname; rev = version; - sha256 = "1wxbjzpwqb9x7vd7kb095fiqj271rki980dnwcxjxpqlmmrmjzyl"; + sha256 = "sha256-2kFVOE5l1KQvDb5KDL7y0p4M7awJLrxJF871cyc0YZ8="; }; - buildInputs = [ libX11 libXft libXinerama fontconfig freetype ]; + buildInputs =[ + libX11 + libXft + libXinerama + fontconfig + freetype + ]; preBuild = '' makeFlagsArray+=( PREFIX="${placeholder "out"}" diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix index f163715456c4..062597745194 100644 --- a/pkgs/applications/window-managers/sawfish/default.nix +++ b/pkgs/applications/window-managers/sawfish/default.nix @@ -1,25 +1,32 @@ -{ stdenv, fetchurl -, pkgconfig, which, autoreconfHook -, rep-gtk, pango, gdk-pixbuf-xlib -, imlib, gettext, texinfo -, libXinerama, libXrandr, libXtst, libICE, libSM +{ stdenv +, fetchurl +, pkg-config +, which +, autoreconfHook +, rep-gtk +, pango +, gdk-pixbuf-xlib +, imlib +, gettext +, texinfo +, libXinerama +, libXrandr +, libXtst +, libICE +, libSM , makeWrapper }: -with stdenv.lib; - stdenv.mkDerivation rec { - pname = "sawfish"; version = "1.12.90"; - sourceName = "sawfish_${version}"; src = fetchurl { - url = "https://download.tuxfamily.org/sawfish/${sourceName}.tar.xz"; + url = "https://download.tuxfamily.org/sawfish/${pname}_${version}.tar.xz"; sha256 = "18p8srqqj9vjffg13qhspfz2gr1h4vfs10qzlv89g76r289iam31"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ which rep-gtk pango gdk-pixbuf-xlib imlib gettext texinfo libXinerama libXrandr libXtst libICE libSM @@ -31,14 +38,15 @@ stdenv.mkDerivation rec { ''; 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" done ''; - meta = { + meta = with stdenv.lib; { description = "An extensible, Lisp-based window manager"; longDescription = '' Sawfish is an extensible window manager using a Lisp-based scripting language. @@ -47,7 +55,7 @@ stdenv.mkDerivation rec { All high-level WM functions are implemented in Lisp for future extensibility or redefinition. ''; - homepage = "http://sawfish.wikia.com"; + homepage = "https://sawfish.fandom.com/wiki/Main_Page"; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; }; |