From 95f917153154ef8ff4bb408ef350675f1b08e89b Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 28 May 2018 15:10:27 -0400
Subject: [PATCH] Revert "inkscape: fix on Darwin"

This reverts commit a276d5160cc4b307d97261b419e183fb3a2214aa.
---
 .../graphics/inkscape/default.nix             | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 89b2a1f171aa..7eb9e7aa0016 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -2,15 +2,9 @@
 , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2
 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper
 , gsl, python2, poppler, imagemagick, libwpg, librevenge
-, libvisio, libcdr, libexif, potrace, autoreconfHook
-, intltool
-, lib
+, libvisio, libcdr, libexif, potrace, cmake
 }:
 
-# 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
   python2Env = python2.withPackages(ps: with ps; [ numpy lxml ]);
 in
@@ -23,6 +17,12 @@ stdenv.mkDerivation rec {
     sha256 = "1chng2yw8dsjxc9gf92aqv7plj11cav8ax321wmakmv5bb09cch6";
   };
 
+  unpackPhase = ''
+    cp $src ${name}.tar.bz2
+    tar xvjf ${name}.tar.bz2 > /dev/null
+    cd ${name}
+  '';
+
   postPatch = ''
     patchShebangs share/extensions
     patchShebangs fix-roff-punct
@@ -33,29 +33,28 @@ stdenv.mkDerivation rec {
       --replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"'
   '';
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook intltool ];
+  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
     perl perlXMLParser libXft libpng zlib popt boehmgc
     libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext
     makeWrapper gsl poppler imagemagick libwpg librevenge
-    libvisio libcdr libexif potrace python2Env
+    libvisio libcdr libexif potrace cmake python2Env
   ];
 
   enableParallelBuilding = true;
 
-  preConfigure = ''
-    intltoolize -f
-  '';
-
   postInstall = ''
     # Make sure PyXML modules can be found at run-time.
     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 *
   NIX_CFLAGS_COMPILE = " -fpermissive ";
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     license = "GPL";
     homepage = https://www.inkscape.org;
     description = "Vector graphics editor";
@@ -66,6 +65,5 @@ stdenv.mkDerivation rec {
 
       If you want to import .eps files install ps2edit.
     '';
-    maintainers = with maintainters; [ matthewbauer ];
   };
 }