From 6bf0a984ef7b164855f1dba154534ed852250001 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 10 Feb 2017 19:17:55 +0200 Subject: [PATCH] ding-libs: Some cleanups - Add version to the name so Nix knows about it - glibc is an implicit buildInput, no need to add it - The docs don't seem to get build anyway, don't try to build them & remove the doxygen build input - Add meta.platforms --- pkgs/tools/misc/ding-libs/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/ding-libs/default.nix b/pkgs/tools/misc/ding-libs/default.nix index 547e3fb49eb..e5daee11b59 100644 --- a/pkgs/tools/misc/ding-libs/default.nix +++ b/pkgs/tools/misc/ding-libs/default.nix @@ -1,26 +1,23 @@ -{ stdenv, fetchurl, glibc, doxygen, check }: +{ stdenv, fetchurl, check }: -let - name = "ding-libs"; +stdenv.mkDerivation rec { + name = "ding-libs-${version}"; version = "0.6.0"; -in stdenv.mkDerivation { - inherit name; - inherit version; src = fetchurl { - url = "https://fedorahosted.org/released/${name}/${name}-${version}.tar.gz"; + url = "https://fedorahosted.org/released/ding-libs/ding-libs-${version}.tar.gz"; sha1 = "c8ec86cb93a26e013a13b12a7b0b3fbc1bca16c1"; }; enableParallelBuilding = true; - buildInputs = [ glibc doxygen check ]; + buildInputs = [ check ]; - buildFlags = "docs"; doCheck = true; meta = { description = "'D is not GLib' utility libraries"; homepage = https://fedorahosted.org/sssd/; + platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [ e-user ]; license = [ stdenv.lib.licenses.gpl3 stdenv.lib.licenses.lgpl3 ]; };