From 11bf5db639e43e4399ed5bda292e866d929d447f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 29 May 2018 15:36:19 +0200 Subject: [PATCH] inkscape: fix build --- pkgs/applications/graphics/inkscape/default.nix | 3 +++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 4 insertions(+) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index de4849e2162..ae3de349412 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -64,6 +64,9 @@ stdenv.mkDerivation rec { rm "$out/share/icons/hicolor/icon-theme.cache" ''; + # 0.92.3 complains about an invalid conversion from const char * to char * + NIX_CFLAGS_COMPILE = " -fpermissive "; + meta = with lib; { license = "GPL"; homepage = https://www.inkscape.org; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f0106586d03..fe4e0cc91f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16413,6 +16413,7 @@ with pkgs; inkscape = callPackage ../applications/graphics/inkscape { lcms = lcms2; + poppler = poppler_0_61; }; inspectrum = libsForQt5.callPackage ../applications/misc/inspectrum { };