JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7608 from joachifm/sawfish-updates

Browse Source 
Sawfish updates
This commit is contained in:
Pascal Wittmann 2015-04-28 17:56:48 +02:00
commit fc61106ae7
3 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/applications/window-managers/sawfish/default.nix
View File

@ -1,17 +1,25 @@
{ stdenv, fetchgit, pkgconfig, which, autoreconfHook, rep-gtk, pango, gdk_pixbuf, libXinerama, libXrandr, libXtst, imlib, gettext, texinfo, makeWrapper }:
{ stdenv, fetchgit, pkgconfig, which, autoreconfHook, rep-gtk, pango
, gdk_pixbuf, libXinerama, libXrandr, libXtst, imlib, gettext, texinfo
, makeWrapper
}:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "sawfish-git-2015-02-15";
name = "sawfish-${version}";
version = "1.11.90";
src = fetchgit {
url = "https://github.com/SawfishWM/sawfish.git";
rev = "44729f44017e6779b4b66a7ecdbd63a98731f668";
sha256 = "bd3f42f1604f37ecb2515008341cac4f6965840b2d6a6639dd1f3f2459f68e73";
rev = "b121f832571c9aebd228691c32604146e49f5e55";
sha256 = "0y7rmjzp7ha5qj9q1dasw50gd6jiaxc0qsjbvyfzxvwssl3i9hsc";
};
buildInputs = [ pkgconfig which autoreconfHook rep-gtk pango gdk_pixbuf libXinerama libXrandr libXtst imlib gettext texinfo makeWrapper ];
buildInputs =
[ pkgconfig which autoreconfHook rep-gtk pango gdk_pixbuf libXinerama
libXrandr libXtst imlib gettext texinfo makeWrapper
];
patchPhase = ''
sed -e 's|REP_DL_LOAD_PATH=|REP_DL_LOAD_PATH=$(REP_DL_LOAD_PATH):|g' -i Makedefs.in
@ -25,7 +33,7 @@ stdenv.mkDerivation rec {
--set REP_LOAD_PATH "$out/share/sawfish/lisp"
done
'';
meta = {
description = "An extensible, Lisp-based window manager";
longDescription = ''

28
pkgs/development/libraries/librep/default.nix
View File

@ -1,18 +1,17 @@
{ stdenv, fetchgit
{ stdenv, fetchurl
, pkgconfig, autoreconfHook
, readline, texinfo
, gdbm, gmp, libffi }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "librep-${version}";
version = "0.92.5";
name = "librep-git-2015-02-15";
src = fetchgit {
url = "https://github.com/SawfishWM/librep.git";
rev = "a1f2db721aa5055e90f6a76fde625946340ed8cf";
sha256 = "c91484d02b2408becc8961997c3d6404aefa8e1f8af4621a8b5f7622b1857fa6";
src = fetchurl {
url = "https://github.com/SawfishWM/librep/archive/${name}.tar.gz";
sha256 = "1ly425cgs0yi3lb5l84v3bacljw7m2nmzgky3acy1anp709iwi76";
};
buildInputs = [ pkgconfig autoreconfHook readline texinfo ];
@ -25,15 +24,12 @@ stdenv.mkDerivation rec {
setupHook = ./setup-hook.sh;
meta = {
description = "Lisp system for Sawfish";
description = "Fast, lightweight, and versatile Lisp environment";
longDescription = ''
This is librep, a Lisp system for UNIX, needed by Sawfish window manager.
It contains a Lisp interpreter, byte-code compiler and virtual machine.
Applications may use the Lisp interpreter as an extension language,
or it may be used for stand-alone scripts.
The Lisp dialect was originally inspired by Emacs Lisp, but with the worst
features removed. It also borrows many ideas from Scheme.
librep is a Lisp system for UNIX, comprising an
interpreter, a byte-code compiler, and a virtual
machine. It can serve as an application extension language
but is also suitable for standalone scripts.
'';
homepage = http://sawfish.wikia.com;
license = licenses.gpl2;

12
pkgs/development/libraries/rep-gtk/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchgit, pkgconfig, autoreconfHook, librep, gtk2 }:
{ stdenv, fetchurl, pkgconfig, autoreconfHook, librep, gtk2 }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "rep-gtk-git-2015-02-15";
name = "rep-gtk-${version}";
version = "0.90.8.2";
src = fetchgit {
url = "https://github.com/SawfishWM/rep-gtk.git";
rev = "74ac3504f2bbbcc9ded005ab97cbf94cdc47924d";
sha256 = "edb47c5b6d09201d16a8f0616d18690ff0a37dca56d31c6e635b286bd0b6a031";
src = fetchurl {
url = "https://github.com/SawfishWM/rep-gtk/archive/${name}.tar.gz";
sha256 = "0pkpp7pj22c8hkyyivr9qw6q08ad42alynsf54ixdy6p9wn4qs1r";
};
buildInputs = [ pkgconfig autoreconfHook ];