From 1da34ac3c4cddc60fc72773ed9f048c3464b80a4 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 15 Apr 2021 12:06:35 -0300 Subject: [PATCH] guile-xcb: rewrite --- .../guile-modules/guile-xcb/default.nix | 39 +++++++++++-------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/pkgs/development/guile-modules/guile-xcb/default.nix b/pkgs/development/guile-modules/guile-xcb/default.nix index 2de44524425..72066313eca 100644 --- a/pkgs/development/guile-modules/guile-xcb/default.nix +++ b/pkgs/development/guile-modules/guile-xcb/default.nix @@ -1,29 +1,36 @@ -{ lib, stdenv, fetchurl, pkg-config, guile, texinfo }: +{ lib +, stdenv +, fetchurl +, guile +, pkg-config +, texinfo +}: -let - name = "guile-xcb-${version}"; +stdenv.mkDerivation rec { + pname = "guile-xcb"; version = "1.3"; -in stdenv.mkDerivation { - inherit name; src = fetchurl { - url = "http://www.markwitmer.com/dist/${name}.tar.gz"; - sha256 = "04dvbqdrrs67490gn4gkq9zk8mqy3mkls2818ha4p0ckhh0pm149"; + url = "http://www.markwitmer.com/dist/${pname}-${version}.tar.gz"; + hash = "sha256-iYR6AYSTgUsURAEJTWcdHlc0f8LzEftAIsfonBteuxE="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ guile texinfo ]; + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + guile + texinfo + ]; - preConfigure = '' - configureFlags=" - --with-guile-site-dir=$out/share/guile/site - --with-guile-site-ccache-dir=$out/share/guile/site - "; - ''; + configureFlags = [ + "--with-guile-site-dir=$out/share/guile/site" + "--with-guile-site-ccache-dir=$out/share/guile/site" + ]; meta = with lib; { - description = "XCB bindings for Guile"; homepage = "http://www.markwitmer.com/guile-xcb/guile-xcb.html"; + description = "XCB bindings for Guile"; license = licenses.gpl3Plus; maintainers = with maintainers; [ vyp ]; platforms = platforms.linux;