From 440af2e5e50f4f9b44a0a911ece2948f4a5b5271 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 22 Nov 2013 16:26:26 +0100 Subject: [PATCH] log4cxx: Clean up package expression. Add meta.license and use a version attribute instead of hardcoding everything. Signed-off-by: aszlig --- pkgs/development/libraries/log4cxx/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix index 67d917f699df..983fabc041e2 100644 --- a/pkgs/development/libraries/log4cxx/default.nix +++ b/pkgs/development/libraries/log4cxx/default.nix @@ -2,11 +2,12 @@ , apr, aprutil, db45, expat }: -stdenv.mkDerivation { - name = "log4cxx-0.10.0"; - +stdenv.mkDerivation rec { + name = "log4cxx-${version}"; + version = "0.10.0"; + src = fetchurl { - url = http://apache.mirrors.hoobly.com/logging/log4cxx/0.10.0/apache-log4cxx-0.10.0.tar.gz; + url = "http://apache.mirrors.hoobly.com/logging/log4cxx/${version}/apache-${name}.tar.gz"; sha256 = "130cjafck1jlqv92mxbn47yhxd2ccwwnprk605c6lmm941i3kq0d"; }; @@ -26,5 +27,6 @@ stdenv.mkDerivation { meta = { homepage = http://logging.apache.org/log4cxx/index.html; description = "A logging framework for C++ patterned after Apache log4j"; + license = stdenv.lib.licenses.asl20; }; }