Merge pull request #188954 from sikmir/libcdr
This commit is contained in:
commit
c480f97455
|
@ -2,22 +2,14 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "libcdr";
|
pname = "libcdr";
|
||||||
version = "0.1.6";
|
version = "0.1.7";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://dev-www.libreoffice.org/src/${pname}-${version}.tar.xz";
|
url = "https://dev-www.libreoffice.org/src/${pname}-${version}.tar.xz";
|
||||||
sha256 = "0qgqlw6i25zfq1gf7f6r5hrhawlrgh92sg238kjpf2839aq01k81";
|
hash = "sha256-VmYknWE0ZrmqHph+pBCcBDZYZuknfYD2zZZj6GuOzdQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
strictDeps = true;
|
||||||
# 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 ];
|
buildInputs = [ libwpg libwpd lcms librevenge icu boost cppunit ];
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
{ fetchurl
|
{ fetchFromGitLab
|
||||||
, lib
|
, lib
|
||||||
, stdenv
|
, stdenv
|
||||||
|
, autoreconfHook
|
||||||
|
, gtk-doc
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, intltool
|
, intltool
|
||||||
, gettext
|
, gettext
|
||||||
|
@ -21,12 +23,26 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchFromGitLab {
|
||||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
domain = "gitlab.gnome.org";
|
||||||
sha256 = "bmwg0HeDOQadWDwNY3WdKX6BfqENDYl+u+ll8W4ujlI=";
|
owner = "GNOME";
|
||||||
|
repo = "libgsf";
|
||||||
|
rev = "LIBGSF_${lib.replaceStrings ["."] ["_"] version}";
|
||||||
|
hash = "sha256-6RP2DJWcDQ8dkKtcPxAkRsS7jSvvLoDNZHXiDJwR8Eg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
# Fix cross-compilation
|
||||||
|
substituteInPlace configure.ac \
|
||||||
|
--replace "AC_PATH_PROG(PKG_CONFIG, pkg-config, no)" \
|
||||||
|
"PKG_PROG_PKG_CONFIG"
|
||||||
|
'';
|
||||||
|
|
||||||
|
strictDeps = true;
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
autoreconfHook
|
||||||
|
gtk-doc
|
||||||
pkg-config
|
pkg-config
|
||||||
intltool
|
intltool
|
||||||
libintl
|
libintl
|
||||||
|
|
Loading…
Reference in a new issue