diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/development/libraries/log4cxx/default.nix | |
parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/log4cxx/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/log4cxx/default.nix | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/nixpkgs/pkgs/development/libraries/log4cxx/default.nix b/nixpkgs/pkgs/development/libraries/log4cxx/default.nix index aaf7ea5ee9c9..898d2a5d9ea4 100644 --- a/nixpkgs/pkgs/development/libraries/log4cxx/default.nix +++ b/nixpkgs/pkgs/development/libraries/log4cxx/default.nix @@ -1,37 +1,22 @@ -{ lib, stdenv, fetchurl, libtool, libxml2, cppunit, boost +{ lib, stdenv, fetchurl, libtool, cmake, libxml2, cppunit, boost , apr, aprutil, db, expat }: stdenv.mkDerivation rec { pname = "log4cxx"; - version = "0.10.0"; + version = "1.1.0"; src = fetchurl { - url = "http://apache.mirrors.hoobly.com/logging/log4cxx/${version}/apache-${pname}-${version}.tar.gz"; - sha256 = "130cjafck1jlqv92mxbn47yhxd2ccwwnprk605c6lmm941i3kq0d"; + url = "mirror://apache/logging/log4cxx/${version}/apache-${pname}-${version}.tar.gz"; + hash = "sha256-H8fYJpdTQYS8D3VzSNlp0khSuUj2PWsXKD/R7inCwoo="; }; - patches = [ - # adapted from upstream commit; will be fixed in next version - ./narrowing-fixes.patch - ]; - postPatch = '' - sed -i -e '1,/^#include/ { - /^#include/i \ - #include <cstdio> \ - #include <cstdlib> \ - #include <cstring> - }' src/examples/cpp/console.cpp \ - src/main/cpp/inputstreamreader.cpp \ - src/main/cpp/socketoutputstream.cpp - '' + lib.optionalString stdenv.isDarwin '' - sed -i 's/namespace std { class locale; }/#include <locale>/' src/main/include/log4cxx/helpers/simpledateformat.h - sed -i 's/\(#include <cctype>\)/\1\n#include <cstdlib>/' src/main/cpp/stringhelper.cpp + substituteInPlace CMakeLists.txt --replace "\\\''${prefix}/" "" ''; buildInputs = [ libxml2 cppunit boost apr aprutil db expat ]; - nativeBuildInputs = [ libtool ]; + nativeBuildInputs = [ libtool cmake ]; meta = { homepage = "https://logging.apache.org/log4cxx/index.html"; |