nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 16:03:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17962 from vbgl/inkscape-darwin

Browse Source 
inkscape: fix on darwin (fixes #15768)
This commit is contained in:
Graham Christensen 2016-08-25 18:14:42 -04:00 committed by GitHub
commit 355cc31229
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/graphics/inkscape/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gtk, libXft
{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, perlXMLParser, gtk, libXft
, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm
, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool
, gsl, python, numpy, pyxml, lxml, poppler, imagemagick, libwpg, librevenge
, libvisio, libcdr, libexif, unzip
, libvisio, libcdr, libexif, unzip, automake114x, autoconf
, boxMakerPlugin ? false # boxmaker plugin
}:
@ -14,6 +14,11 @@ boxmaker = fetchurl {
sha256 = "5c5697f43dc3a95468f61f479cb50b7e2b93379a1729abf19e4040ac9f43a1a8";
};
stdcxx-patch = fetchpatch {
url = http://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/diff/14542?context=3;
sha256 = "15h831lsh61ichgdygkdkbdm1dlb9mhprldq27hkx2472lcnyx6y";
};
in
stdenv.mkDerivation rec {
@ -28,6 +33,7 @@ stdenv.mkDerivation rec {
patches = [ ./deprecated-scopedptr.patch ];
postPatch = ''
patch -i ${stdcxx-patch} -p 0
patchShebangs share/extensions
''
# Clang gets misdetected, so hardcode the right answer
@ -46,7 +52,7 @@ stdenv.mkDerivation rec {
pkgconfig perl perlXMLParser gtk libXft libpng zlib popt boehmgc
libxml2 libxslt glib gtkmm glibmm libsigcxx lcms boost gettext
makeWrapper intltool gsl poppler imagemagick libwpg librevenge
libvisio libcdr libexif
libvisio libcdr libexif automake114x autoconf
] ++ stdenv.lib.optional boxMakerPlugin unzip;
enableParallelBuilding = true;

9
pkgs/development/libraries/cairomm/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, pkgconfig, cairo, xlibsWrapper, fontconfig, freetype, libsigcxx }:
{ fetchurl, stdenv, pkgconfig, darwin, cairo, xlibsWrapper, fontconfig, freetype, libsigcxx }:
let
ver_maj = "1.12";
ver_min = "0";
@ -13,7 +13,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ cairo libsigcxx ];
buildInputs = [ fontconfig freetype ];
buildInputs = [ fontconfig freetype ]
++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
ApplicationServices
]);
doCheck = true;
@ -35,6 +38,6 @@ stdenv.mkDerivation rec {
homepage = http://cairographics.org/;
license = with licenses; [ lgpl2Plus mpl10 ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}