From da6c83aa3b5be3225b262b3c8117d5e0d619a152 Mon Sep 17 00:00:00 2001 From: jammerful Date: Wed, 26 Apr 2017 16:32:15 -0400 Subject: [PATCH] log4shib: init at 1.0.9 Required by the Shibboleth Service Provider Package --- .../development/libraries/log4shib/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 8 +++++--- 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/log4shib/default.nix diff --git a/pkgs/development/libraries/log4shib/default.nix b/pkgs/development/libraries/log4shib/default.nix new file mode 100644 index 00000000000..f9b68e1a0cf --- /dev/null +++ b/pkgs/development/libraries/log4shib/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchgit, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "log4shib-${version}"; + version = "1.0.9"; + + src = fetchgit { + url = "https://git.shibboleth.net/git/cpp-log4shib.git"; + rev = "a1afe19b7b49c32fcb03e6d72809501b8965cf85"; + sha256 = "06rrc5l6qxlc8abzim2jcxwz2c577qrjqx15cbfqq1zfqagj9hix"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = { + description = "A forked version of log4cpp that has been created for the Shibboleth project"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f7d6ea92b5..c77d29e225c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3380,7 +3380,7 @@ with pkgs; paper-gtk-theme = callPackage ../misc/themes/paper { }; paperwork = callPackage ../applications/office/paperwork { }; - + papertrail = callPackage ../tools/text/papertrail { }; par2cmdline = callPackage ../tools/networking/par2cmdline { }; @@ -9051,6 +9051,8 @@ with pkgs; log4cplus = callPackage ../development/libraries/log4cplus { }; + log4shib = callPackage ../development/libraries/log4shib { }; + loudmouth = callPackage ../development/libraries/loudmouth { }; luabind = callPackage ../development/libraries/luabind { lua = lua5_1; }; @@ -9607,8 +9609,8 @@ with pkgs; libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { }; - libqtav = callPackage ../development/libraries/libqtav { - libva = libva-full; # also wants libva-x11 + libqtav = callPackage ../development/libraries/libqtav { + libva = libva-full; # also wants libva-x11 }; mlt = callPackage ../development/libraries/mlt/qt-5.nix {