public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source 
A few more rebuilds (~1k on x86_64-linux).
This commit is contained in:
Vladimír Čunát
2019-01-05 13:37:38 +01:00
parent d9707792b5 17f4d415a2
commit d84a33d85b
27 changed files with 142 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,25 +1,17 @@
{ stdenv, fetchurl, libwpg, libwpd, lcms, pkgconfig, librevenge, icu, boost, cppunit }:
stdenv.mkDerivation rec {
name = "libcdr-0.1.4";
name = "libcdr-0.1.5";
src = fetchurl {
url = "https://dev-www.libreoffice.org/src/${name}.tar.xz";
sha256 = "0vd6likgk51j46llybkx4wq3674xzrhp0k82220pkx9x1aqfi9z7";
sha256 = "0j1skr11jwvafn0l6p37v3i4lqc8wcn489g8f7c4mqwbk94mrkka";
};
buildInputs = [ libwpg libwpd lcms librevenge icu boost cppunit ];
nativeBuildInputs = [ pkgconfig ];
# Boost 1.59 compatability fix
# Attempt removing when updating
postPatch = ''
sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in
'';
configureFlags = stdenv.lib.optional stdenv.cc.isClang "--disable-werror";
CXXFLAGS="--std=gnu++0x"; # For c++11 constants in lcms2.h
meta = {