From ad4167e87e647c784a27b07104d32cb41c23ac88 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 16 Jul 2015 03:48:41 +0200 Subject: [PATCH] ggz_base_libs: reimplement using mkDerivation --- .../libraries/ggz_base_libs/default.nix | 59 ++++++------------- 1 file changed, 18 insertions(+), 41 deletions(-) diff --git a/pkgs/development/libraries/ggz_base_libs/default.nix b/pkgs/development/libraries/ggz_base_libs/default.nix index b74aa3447a3c..5e3adb0ace2d 100644 --- a/pkgs/development/libraries/ggz_base_libs/default.nix +++ b/pkgs/development/libraries/ggz_base_libs/default.nix @@ -1,53 +1,30 @@ -x@{builderDefsPackage - , intltool, openssl, expat, libgcrypt - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl, intltool, openssl, expat, libgcrypt }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="ggz-base-libs"; - version="0.99.5"; - name="${baseName}-snapshot-${version}"; - url="http://mirrors.ibiblio.org/pub/mirrors/ggzgamingzone/ggz/snapshots/${name}.tar.gz"; - hash="1cw1vg0fbj36zyggnzidx9cbjwfc1yr4zqmsipxnvns7xa2awbdk"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; +stdenv.mkDerivation rec { + version = "0.99.5"; + baseName = "ggz-base-libs"; + name = "${baseName}-snapshot-${version}"; + + src = fetchurl { + url = "http://mirrors.ibiblio.org/pub/mirrors/ggzgamingzone/ggz/snapshots/${name}.tar.gz"; + sha256 = "1cw1vg0fbj36zyggnzidx9cbjwfc1yr4zqmsipxnvns7xa2awbdk"; }; - inherit (sourceInfo) name version; - inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; + buildInputs = [ intltool openssl expat libgcrypt ]; configureFlags = [ - "--with-ssl-dir=${a.openssl}/" + "--with-ssl-dir=${openssl}/" "--with-tls" ]; - - meta = { + + meta = with stdenv.lib; { description = "GGZ Gaming zone libraries"; - maintainers = with a.lib.maintainers; + maintainers = with maintainers; [ raskin ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.gpl2; + platforms = platforms.linux; + license = licenses.gpl2; + downloadPage = "http://www.ggzgamingzone.org/releases/"; }; - passthru = { - updateInfo = { - downloadPage = "http://www.ggzgamingzone.org/releases/"; - }; - }; -}) x - +}