summaryrefslogtreecommitdiffstats
path: root/pkgs/development/guile-modules
diff options
context:
space:
mode:
authorRemy Goldschmidt <taktoa@gmail.com>2015-07-22 12:56:03 -0500
committerRemy Goldschmidt <taktoa@gmail.com>2015-07-23 04:13:03 -0500
commit45e3892386e5bf93872e69781b7b065c6749403b (patch)
tree705e31ebeb363c6206ffdb066760585d1ad6c3ce /pkgs/development/guile-modules
parentd2f923341aef2317774ff55b23c46dffada86a24 (diff)
guile-gnome-platform: 2.16.1 -> 2015/01/23 git
Diffstat (limited to 'pkgs/development/guile-modules')
-rw-r--r--pkgs/development/guile-modules/guile-gnome/default.nix44
1 files changed, 31 insertions, 13 deletions
diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix
index e2392773de7e..24928fc067fd 100644
--- a/pkgs/development/guile-modules/guile-gnome/default.nix
+++ b/pkgs/development/guile-modules/guile-gnome/default.nix
@@ -1,21 +1,39 @@
-{ fetchurl, stdenv, guile, guile_lib, gwrap
+{ fetchgit, stdenv, guile, guile_lib, gwrap
, pkgconfig, gconf, glib, gnome_vfs, gtk
-, libglade, libgnome, libgnomecanvas, libgnomeui, pango, guileCairo }:
+, libglade, libgnome, libgnomecanvas, libgnomeui
+, pango, guileCairo, autoconf, automake, texinfo }:
stdenv.mkDerivation rec {
- name = "guile-gnome-platform-2.16.1";
+ name = "guile-gnome-platform-20150123";
- src = fetchurl {
- url = "mirror://gnu/guile-gnome/guile-gnome-platform/${name}.tar.gz";
- sha256 = "0yy5f4c78jlakxi2bwgh3knc2szw26hg68xikyaza2iim39mc22c";
+ src = fetchgit {
+ url = "git://git.sv.gnu.org/guile-gnome.git";
+ rev = "0fcbe69797b9501b8f1283a78eb92bf43b08d080";
+ sha256 = "1vqlzb356ggmp8jh833gksg59c53vbmmhycbcf52qj0fdz09mpb5";
};
- buildInputs =
- [ guile gwrap
- pkgconfig gconf glib gnome_vfs gtk libglade libgnome libgnomecanvas
- libgnomeui pango guileCairo
- ]
- ++ stdenv.lib.optional doCheck guile_lib;
+ buildInputs = [
+ autoconf
+ automake
+ texinfo
+ guile
+ gwrap
+ pkgconfig
+ gconf
+ glib
+ gnome_vfs
+ gtk
+ libglade
+ libgnome
+ libgnomecanvas
+ libgnomeui
+ pango
+ guileCairo
+ ] ++ stdenv.lib.optional doCheck guile_lib;
+
+ preConfigure = ''
+ ./autogen.sh
+ '';
# The test suite tries to open an X display, which fails.
doCheck = false;
@@ -35,6 +53,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl2Plus;
- maintainers = [ ];
+ maintainers = [ stdenv.lib.maintainers.taktoa ];
};
}