From 03ba2b5039abfe90d22ae00059726ca257d3bbae Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 15 Apr 2021 11:56:58 -0300 Subject: [PATCH] guile-gnome: rewrite --- .../guile-modules/guile-gnome/default.nix | 48 +++++++++++++++---- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix index 2dc07deac5c..ead08ce0231 100644 --- a/pkgs/development/guile-modules/guile-gnome/default.nix +++ b/pkgs/development/guile-modules/guile-gnome/default.nix @@ -1,7 +1,21 @@ -{ fetchurl, lib, stdenv, guile, guile-lib, gwrap -, pkg-config, gconf, glib, gnome_vfs, gtk2 -, libglade, libgnome, libgnomecanvas, libgnomeui -, pango, guile-cairo, texinfo +{ lib +, stdenv +, fetchurl +, gconf +, glib +, gnome_vfs +, gtk2 +, guile +, guile-cairo +, guile-lib +, gwrap +, libglade +, libgnome +, libgnomecanvas +, libgnomeui +, pango +, pkg-config +, texinfo }: stdenv.mkDerivation rec { @@ -10,20 +24,37 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/guile-gnome/${pname}/${pname}-${version}.tar.gz"; - sha256 = "adabd48ed5993d8528fd604e0aa0d96ad81a61d06da6cdd68323572ad6c216c3"; + hash = "sha256-ravUjtWZPYUo/WBOCqDZatgaYdBtps3WgyNXKtbCFsM="; }; + nativeBuildInputs = [ + pkg-config + texinfo + ]; buildInputs = [ - texinfo guile gwrap pkg-config gconf glib gnome_vfs gtk2 - libglade libgnome libgnomecanvas libgnomeui pango guile-cairo + gconf + glib + gnome_vfs + gtk2 + guile + guile-cairo + gwrap + libglade + libgnome + libgnomecanvas + libgnomeui + pango ] ++ lib.optional doCheck guile-lib; # The test suite tries to open an X display, which fails. doCheck = false; - GUILE_AUTO_COMPILE = 0; + makeFlags = [ + "GUILE_AUTO_COMPILE=0" + ]; meta = with lib; { + homepage = "https://www.gnu.org/software/guile-gnome/"; description = "GNOME bindings for GNU Guile"; longDescription = '' GNU guile-gnome brings the power of Scheme to your graphical application. @@ -32,7 +63,6 @@ stdenv.mkDerivation rec { guile-gnome a comprehensive environment for developing modern applications. ''; - homepage = "https://www.gnu.org/software/guile-gnome/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ vyp ]; platforms = platforms.linux;