b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #8952 from taktoa/taktoa-guile

Browse source 
g-wrap: 1.9.13 -> 1.9.15 and guile-gnome: 2.16.1 -> 2015/01/23 git
This commit is contained in:
Arseniy Seroka 2015-07-23 13:51:46 +03:00
parent af2ab0b911 45e3892386
commit 4588557d01
2 changed files with 35 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
pkgs/development/guile-modules/guile-gnome/default.nix
View file

@ -1,21 +1,39 @@
{ fetchurl, stdenv, guile, guile_lib, gwrap { fetchgit, stdenv, guile, guile_lib, gwrap
, pkgconfig, gconf, glib, gnome_vfs, gtk , pkgconfig, gconf, glib, gnome_vfs, gtk
, libglade, libgnome, libgnomecanvas, libgnomeui, pango, guileCairo }: , libglade, libgnome, libgnomecanvas, libgnomeui
, pango, guileCairo, autoconf, automake, texinfo }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "guile-gnome-platform-2.16.1"; name = "guile-gnome-platform-20150123";
src = fetchurl { src = fetchgit {
url = "mirror://gnu/guile-gnome/guile-gnome-platform/${name}.tar.gz"; url = "git://git.sv.gnu.org/guile-gnome.git";
sha256 = "0yy5f4c78jlakxi2bwgh3knc2szw26hg68xikyaza2iim39mc22c"; rev = "0fcbe69797b9501b8f1283a78eb92bf43b08d080";
sha256 = "1vqlzb356ggmp8jh833gksg59c53vbmmhycbcf52qj0fdz09mpb5";
}; };
buildInputs = buildInputs = [
[ guile gwrap autoconf
pkgconfig gconf glib gnome_vfs gtk libglade libgnome libgnomecanvas automake
libgnomeui pango guileCairo texinfo
] guile
++ stdenv.lib.optional doCheck guile_lib; 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. # The test suite tries to open an X display, which fails.
doCheck = false; doCheck = false;
@ -35,6 +53,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl2Plus; license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ ]; maintainers = [ stdenv.lib.maintainers.taktoa ];
}; };
} }

9
pkgs/development/tools/guile/g-wrap/default.nix
View file

@ -1,11 +1,10 @@
{ fetchurl, stdenv, guile, libffi, pkgconfig, glib { fetchurl, stdenv, guile, libffi, pkgconfig, glib, guile_lib }:
, guile_lib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "g-wrap-1.9.13"; name = "g-wrap-1.9.15";
src = fetchurl { src = fetchurl {
url = "mirror://savannah/g-wrap/${name}.tar.gz"; 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 # 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/; homepage = http://www.nongnu.org/g-wrap/;
license = stdenv.lib.licenses.lgpl2Plus; license = stdenv.lib.licenses.lgpl2Plus;
maintainers = [ ]; maintainers = [ stdenv.lib.maintainers.taktoa ];
}; };
} }