From 6a71d0b6bf9344b92c9db60643bd17605d23ef56 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 15 Apr 2021 11:49:02 -0300 Subject: [PATCH] guile-cairo: rewrite --- .../guile-modules/guile-cairo/default.nix | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix index 15e3ccbb972..1ea76cb237d 100644 --- a/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/pkgs/development/guile-modules/guile-cairo/default.nix @@ -1,23 +1,38 @@ -{ lib, stdenv, fetchurl, pkg-config, guile, guile-lib, cairo, expat }: +{ lib +, stdenv +, fetchurl +, cairo +, expat +, guile +, guile-lib +, pkg-config +}: stdenv.mkDerivation rec { pname = "guile-cairo"; version = "1.11.2"; src = fetchurl { - url = "mirror://savannah/guile-cairo/${pname}-${version}.tar.gz"; - sha256 = "0yx0844p61ljd4d3d63qrawiygiw6ks02fwv2cqx7nav5kfd8ck2"; + url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; + hash = "sha256-YjLU3Cxb2dMxE5s7AfQ0PD4fucp4mDYaaZIGcwlBoHs="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + cairo + expat + guile + ]; - buildInputs = [ guile cairo expat ]; enableParallelBuilding = true; doCheck = false; # Cannot find unit-test module from guile-lib checkInputs = [ guile-lib ]; meta = with lib; { + homepage = "https://www.nongnu.org/guile-cairo/"; description = "Cairo bindings for GNU Guile"; longDescription = '' Guile-Cairo wraps the Cairo graphics library for Guile Scheme. @@ -28,7 +43,6 @@ stdenv.mkDerivation rec { maintained graphics library with all of the benefits of Scheme: memory management, exceptions, macros, and a dynamic programming environment. ''; - homepage = "https://www.nongnu.org/guile-cairo/"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ vyp ]; platforms = platforms.linux;