diff options
| -rw-r--r-- | pkgs/development/guile-modules/guile-gnome/default.nix | 44 | ||||
| -rw-r--r-- | pkgs/development/tools/guile/g-wrap/default.nix | 9 |
2 files changed, 35 insertions, 18 deletions
diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix index e2392773de7..24928fc067f 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 ]; }; } diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix index e62ce13ebf7..ed492a0b82d 100644 --- a/pkgs/development/tools/guile/g-wrap/default.nix +++ b/pkgs/development/tools/guile/g-wrap/default.nix @@ -1,11 +1,10 @@ -{ fetchurl, stdenv, guile, libffi, pkgconfig, glib -, guile_lib }: +{ fetchurl, stdenv, guile, libffi, pkgconfig, glib, guile_lib }: stdenv.mkDerivation rec { - name = "g-wrap-1.9.13"; + name = "g-wrap-1.9.15"; src = fetchurl { url = "mirror://savannah/g-wrap/${name}.tar.gz"; - sha256 = "0fc874zlwzjahyliqnva1zfsv0chlx4cvfhwchij9n2d3kmsss9v"; + sha256 = "140fcvp24pqmfmiibhjxl3s75hj26ln7pkl2wxas84lnchbj9m4d"; }; # Note: Glib support is optional, but it's quite useful (e.g., it's @@ -26,6 +25,6 @@ stdenv.mkDerivation rec { ''; homepage = http://www.nongnu.org/g-wrap/; license = stdenv.lib.licenses.lgpl2Plus; - maintainers = [ ]; + maintainers = [ stdenv.lib.maintainers.taktoa ]; }; } |