tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
inkscape: fix on darwin
Vincent Laporte
9 years ago
42701ee3
b4b244de
+9
-3
1 changed file
expand all
collapse all
unified
split
pkgs
applications
graphics
inkscape
default.nix
+9
-3
pkgs/applications/graphics/inkscape/default.nix
···
1
1
-
{ stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gtk, libXft
1
1
+
{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, perlXMLParser, gtk, libXft
2
2
, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm
3
3
, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool
4
4
, gsl, python, numpy, pyxml, lxml, poppler, imagemagick, libwpg, librevenge
5
5
-
, libvisio, libcdr, libexif, unzip
5
5
+
, libvisio, libcdr, libexif, unzip, automake114x, autoconf
6
6
, boxMakerPlugin ? false # boxmaker plugin
7
7
}:
8
8
···
14
14
sha256 = "5c5697f43dc3a95468f61f479cb50b7e2b93379a1729abf19e4040ac9f43a1a8";
15
15
};
16
16
17
17
+
stdcxx-patch = fetchpatch {
18
18
+
url = http://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/diff/14542?context=3;
19
19
+
sha256 = "15h831lsh61ichgdygkdkbdm1dlb9mhprldq27hkx2472lcnyx6y";
20
20
+
};
21
21
+
17
22
in
18
23
19
24
stdenv.mkDerivation rec {
···
28
33
patches = [ ./deprecated-scopedptr.patch ];
29
34
30
35
postPatch = ''
36
36
+
patch -i ${stdcxx-patch} -p 0
31
37
patchShebangs share/extensions
32
38
''
33
39
# Clang gets misdetected, so hardcode the right answer
···
46
52
pkgconfig perl perlXMLParser gtk libXft libpng zlib popt boehmgc
47
53
libxml2 libxslt glib gtkmm glibmm libsigcxx lcms boost gettext
48
54
makeWrapper intltool gsl poppler imagemagick libwpg librevenge
49
49
-
libvisio libcdr libexif
55
55
+
libvisio libcdr libexif automake114x autoconf
50
56
] ++ stdenv.lib.optional boxMakerPlugin unzip;
51
57
52
58
enableParallelBuilding = true;