From f1fda2eab3fe589504c7c226b264640aaf9d5ebb Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 4 Feb 2019 10:30:04 -0600
Subject: ipe: 7.2.9 -> 7.2.10

https://mailman.science.uu.nl/pipermail/ipe-announce/2019-February/000077.html

Cleanup a bit while visiting :).
---
 pkgs/applications/graphics/ipe/default.nix | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'pkgs/applications/graphics')

diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix
index ee5c348eb6be..140227eb9eca 100644
--- a/pkgs/applications/graphics/ipe/default.nix
+++ b/pkgs/applications/graphics/ipe/default.nix
@@ -3,26 +3,16 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ipe-7.2.9";
+  name = "ipe-7.2.10";
 
   src = fetchurl {
     url = "https://dl.bintray.com/otfried/generic/ipe/7.2/${name}-src.tar.gz";
-    sha256 = "1i0h0q32xvbb0d3y2ff76jxnaw05hjf2z5gzww886z8arxwar1xn";
+    sha256 = "0rm31kvyg30452bz12yi49bkhdmi4bjdx6zann5cdlbi0pvmx7xh";
   };
 
-  # changes taken from Gentoo portage
-  preConfigure = ''
-    cd src
-    sed -i \
-      -e 's/fpic/fPIC/' \
-      -e 's/moc-qt4/moc/' \
-      config.mak || die
-    sed -i -e 's/install -s/install/' common.mak || die
-  '';
-
-  NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; # build with Qt 5.7
+  sourceRoot = "${name}/src";
 
-  IPEPREFIX="$$out";
+  IPEPREFIX="${placeholder "out"}";
   URWFONTDIR="${texlive}/texmf-dist/fonts/type1/urw/";
   LUA_PACKAGE = "lua";
 
@@ -38,6 +28,8 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  enableParallelBuilding = true;
+
   #TODO: make .desktop entry
 
   meta = {
-- 
cgit 1.4.1