diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-08-08 16:04:42 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-08-13 06:35:37 +0000 |
commit | 12aaa58dac35800b5b7d77f81cf2a87c21ee55da (patch) | |
tree | be0add9e5c22a85d20b5d78206aa74f956eb2a1b /nixpkgs/pkgs/development/libraries/libe-book/default.nix | |
parent | 45892a5591202f75a1c2f1ca7c62a92c7566e3c5 (diff) | |
parent | 5a8e9243812ba528000995b294292d3b5e120947 (diff) | |
download | nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.gz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.bz2 nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.lz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.xz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.zst nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: 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/libraries/mesa/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libe-book/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libe-book/default.nix | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libe-book/default.nix b/nixpkgs/pkgs/development/libraries/libe-book/default.nix index 095fb0ff79d0..f066e470568b 100644 --- a/nixpkgs/pkgs/development/libraries/libe-book/default.nix +++ b/nixpkgs/pkgs/development/libraries/libe-book/default.nix @@ -15,11 +15,20 @@ stdenv.mkDerivation rec { pname = "libe-book"; version = "0.1.3"; + src = fetchurl { - url = "https://kent.dl.sourceforge.net/project/libebook/libe-book-${version}/libe-book-${version}.tar.xz"; - sha256 = "sha256-fo2P808ngxrKO8b5zFMsL5DSBXx3iWO4hP89HjTf4fk="; + url = "mirror://sourceforge/libebook/libe-book-${version}/libe-book-${version}.tar.xz"; + hash = "sha256-fo2P808ngxrKO8b5zFMsL5DSBXx3iWO4hP89HjTf4fk="; }; + + # restore compatibility with icu68+ + postPatch = '' + substituteInPlace src/lib/EBOOKCharsetConverter.cpp --replace \ + "TRUE, TRUE, &status)" \ + "true, true, &status)" + ''; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ gperf librevenge @@ -30,12 +39,9 @@ stdenv.mkDerivation rec { zlib liblangtag ]; - # Boost 1.59 compatibility fix - # Attempt removing when updating - postPatch = '' - sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in - ''; + env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-function"; + meta = with lib; { description = "Library for import of reflowable e-book formats"; license = licenses.lgpl21Plus; |