dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #114084 from r-burns/libcdr

Browse Source 
[staging-next] libcdr: fix build
This commit is contained in:
Sandro 2021-02-23 17:44:11 +01:00 committed by GitHub
commit e3241147dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/libcdr/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, libwpg, libwpd, lcms, pkg-config, librevenge, icu, boost, cppunit }:
{ lib, stdenv, fetchurl, fetchpatch, libwpg, libwpd, lcms, pkg-config, librevenge, icu, boost, cppunit }:
stdenv.mkDerivation rec {
name = "libcdr-0.1.6";
@ -8,6 +8,16 @@ stdenv.mkDerivation rec {
sha256 = "0qgqlw6i25zfq1gf7f6r5hrhawlrgh92sg238kjpf2839aq01k81";
};
patches = [
# Fix build with icu 68
# Remove in next release
(fetchpatch {
name = "libcdr-fix-icu-68";
url = "https://cgit.freedesktop.org/libreoffice/libcdr/patch/?id=bf3e7f3bbc414d4341cf1420c99293debf1bd894";
sha256 = "0cgra10p8ibgwn8y5q31jrpan317qj0ribzjs4jq0bwavjq92w2k";
})
];
buildInputs = [ libwpg libwpd lcms librevenge icu boost cppunit ];
nativeBuildInputs = [ pkg-config ];