mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 12:42:24 +00:00
Code Issues Wiki Activity

Revert "inkscape: fix on Darwin"

Browse source 
This reverts commit a276d5160c.
This commit is contained in:
Matthew Bauer 2018-05-28 15:10:27 -04:00
parent 012a3a3f9b
commit 95f9171531
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
pkgs/applications/graphics/inkscape/default.nix
View file

@ -2,15 +2,9 @@
, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2 , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2
, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper
, gsl, python2, poppler, imagemagick, libwpg, librevenge , gsl, python2, poppler, imagemagick, libwpg, librevenge
, libvisio, libcdr, libexif, potrace, autoreconfHook , libvisio, libcdr, libexif, potrace, cmake
, intltool
, lib
}: }:
# Note that originally this Nix expression used CMake to build but
# this led to errors on MacOS of "Too many arguments". Inkscape
# supports autoconf and we will use this for now on.
let let
python2Env = python2.withPackages(ps: with ps; [ numpy lxml ]); python2Env = python2.withPackages(ps: with ps; [ numpy lxml ]);
in in
@ -23,6 +17,12 @@ stdenv.mkDerivation rec {
sha256 = "1chng2yw8dsjxc9gf92aqv7plj11cav8ax321wmakmv5bb09cch6"; sha256 = "1chng2yw8dsjxc9gf92aqv7plj11cav8ax321wmakmv5bb09cch6";
}; };
unpackPhase = ''
cp $src ${name}.tar.bz2
tar xvjf ${name}.tar.bz2 > /dev/null
cd ${name}
'';
postPatch = '' postPatch = ''
patchShebangs share/extensions patchShebangs share/extensions
patchShebangs fix-roff-punct patchShebangs fix-roff-punct
@ -33,29 +33,28 @@ stdenv.mkDerivation rec {
--replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"' --replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"'
''; '';
nativeBuildInputs = [ pkgconfig autoreconfHook intltool ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
perl perlXMLParser libXft libpng zlib popt boehmgc perl perlXMLParser libXft libpng zlib popt boehmgc
libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext
makeWrapper gsl poppler imagemagick libwpg librevenge makeWrapper gsl poppler imagemagick libwpg librevenge
libvisio libcdr libexif potrace python2Env libvisio libcdr libexif potrace cmake python2Env
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;
preConfigure = ''
intltoolize -f
'';
postInstall = '' postInstall = ''
# Make sure PyXML modules can be found at run-time. # Make sure PyXML modules can be found at run-time.
rm "$out/share/icons/hicolor/icon-theme.cache" rm "$out/share/icons/hicolor/icon-theme.cache"
'' + stdenv.lib.optionalString stdenv.isDarwin ''
install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkscape
install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkview
''; '';
# 0.92.3 complains about an invalid conversion from const char * to char * # 0.92.3 complains about an invalid conversion from const char * to char *
NIX_CFLAGS_COMPILE = " -fpermissive "; NIX_CFLAGS_COMPILE = " -fpermissive ";
meta = with lib; { meta = with stdenv.lib; {
license = "GPL"; license = "GPL";
homepage = https://www.inkscape.org; homepage = https://www.inkscape.org;
description = "Vector graphics editor"; description = "Vector graphics editor";
@ -66,6 +65,5 @@ stdenv.mkDerivation rec {
If you want to import .eps files install ps2edit. If you want to import .eps files install ps2edit.
''; '';
maintainers = with maintainters; [ matthewbauer ];
}; };
} }