tjh.dev
Merge pull request #7608 from joachifm/sawfish-updates
Sawfish updates
+14
-6
pkgs/applications/window-managers/sawfish/default.nix
+14
-6
pkgs/applications/window-managers/sawfish/default.nix
···
1
-
{ stdenv, fetchgit, pkgconfig, which, autoreconfHook, rep-gtk, pango, gdk_pixbuf, libXinerama, libXrandr, libXtst, imlib, gettext, texinfo, makeWrapper }:
1
+
{ stdenv, fetchgit, pkgconfig, which, autoreconfHook, rep-gtk, pango
2
+
, gdk_pixbuf, libXinerama, libXrandr, libXtst, imlib, gettext, texinfo
3
+
, makeWrapper
4
+
}:
2
5
3
6
with stdenv.lib;
7
+
4
8
stdenv.mkDerivation rec {
5
9
6
-
name = "sawfish-git-2015-02-15";
10
+
name = "sawfish-${version}";
11
+
version = "1.11.90";
7
12
8
13
src = fetchgit {
9
14
url = "https://github.com/SawfishWM/sawfish.git";
10
-
rev = "44729f44017e6779b4b66a7ecdbd63a98731f668";
11
-
sha256 = "bd3f42f1604f37ecb2515008341cac4f6965840b2d6a6639dd1f3f2459f68e73";
15
+
rev = "b121f832571c9aebd228691c32604146e49f5e55";
16
+
sha256 = "0y7rmjzp7ha5qj9q1dasw50gd6jiaxc0qsjbvyfzxvwssl3i9hsc";
12
17
};
13
18
14
-
buildInputs = [ pkgconfig which autoreconfHook rep-gtk pango gdk_pixbuf libXinerama libXrandr libXtst imlib gettext texinfo makeWrapper ];
19
+
buildInputs =
20
+
[ pkgconfig which autoreconfHook rep-gtk pango gdk_pixbuf libXinerama
21
+
libXrandr libXtst imlib gettext texinfo makeWrapper
22
+
];
15
23
16
24
patchPhase = ''
17
25
sed -e 's|REP_DL_LOAD_PATH=|REP_DL_LOAD_PATH=$(REP_DL_LOAD_PATH):|g' -i Makedefs.in
···
25
33
--set REP_LOAD_PATH "$out/share/sawfish/lisp"
26
34
done
27
35
'';
28
-
36
+
29
37
meta = {
30
38
description = "An extensible, Lisp-based window manager";
31
39
longDescription = ''
+12
-16
pkgs/development/libraries/librep/default.nix
+12
-16
pkgs/development/libraries/librep/default.nix
···
1
-
2
-
{ stdenv, fetchgit
1
+
{ stdenv, fetchurl
3
2
, pkgconfig, autoreconfHook
4
3
, readline, texinfo
5
4
, gdbm, gmp, libffi }:
6
5
7
6
with stdenv.lib;
8
-
stdenv.mkDerivation rec {
9
7
10
-
name = "librep-git-2015-02-15";
8
+
stdenv.mkDerivation rec {
9
+
name = "librep-${version}";
10
+
version = "0.92.5";
11
11
12
-
src = fetchgit {
13
-
url = "https://github.com/SawfishWM/librep.git";
14
-
rev = "a1f2db721aa5055e90f6a76fde625946340ed8cf";
15
-
sha256 = "c91484d02b2408becc8961997c3d6404aefa8e1f8af4621a8b5f7622b1857fa6";
12
+
src = fetchurl {
13
+
url = "https://github.com/SawfishWM/librep/archive/${name}.tar.gz";
14
+
sha256 = "1ly425cgs0yi3lb5l84v3bacljw7m2nmzgky3acy1anp709iwi76";
16
15
};
17
16
18
17
buildInputs = [ pkgconfig autoreconfHook readline texinfo ];
···
25
24
setupHook = ./setup-hook.sh;
26
25
27
26
meta = {
28
-
description = "Lisp system for Sawfish";
27
+
description = "Fast, lightweight, and versatile Lisp environment";
29
28
longDescription = ''
30
-
This is librep, a Lisp system for UNIX, needed by Sawfish window manager.
31
-
It contains a Lisp interpreter, byte-code compiler and virtual machine.
32
-
Applications may use the Lisp interpreter as an extension language,
33
-
or it may be used for stand-alone scripts.
34
-
35
-
The Lisp dialect was originally inspired by Emacs Lisp, but with the worst
36
-
features removed. It also borrows many ideas from Scheme.
29
+
librep is a Lisp system for UNIX, comprising an
30
+
interpreter, a byte-code compiler, and a virtual
31
+
machine. It can serve as an application extension language
32
+
but is also suitable for standalone scripts.
37
33
'';
38
34
homepage = http://sawfish.wikia.com;
39
35
license = licenses.gpl2;
+6
-6
pkgs/development/libraries/rep-gtk/default.nix
+6
-6
pkgs/development/libraries/rep-gtk/default.nix
···
1
-
{ stdenv, fetchgit, pkgconfig, autoreconfHook, librep, gtk2 }:
1
+
{ stdenv, fetchurl, pkgconfig, autoreconfHook, librep, gtk2 }:
2
2
3
3
with stdenv.lib;
4
4
stdenv.mkDerivation rec {
5
5
6
-
name = "rep-gtk-git-2015-02-15";
6
+
name = "rep-gtk-${version}";
7
+
version = "0.90.8.2";
7
8
8
-
src = fetchgit {
9
-
url = "https://github.com/SawfishWM/rep-gtk.git";
10
-
rev = "74ac3504f2bbbcc9ded005ab97cbf94cdc47924d";
11
-
sha256 = "edb47c5b6d09201d16a8f0616d18690ff0a37dca56d31c6e635b286bd0b6a031";
9
+
src = fetchurl {
10
+
url = "https://github.com/SawfishWM/rep-gtk/archive/${name}.tar.gz";
11
+
sha256 = "0pkpp7pj22c8hkyyivr9qw6q08ad42alynsf54ixdy6p9wn4qs1r";
12
12
};
13
13
14
14
buildInputs = [ pkgconfig autoreconfHook ];