Merge pull request #55214 from dtzWill/update/ipe-7.2.10

ipe: 7.2.9 -> 7.2.10
NixOS · Feb 12, 2019 · 91c7157 · 91c7157
2 parents 92a54bd + f1fda2e
commit 91c7157
Showing 1 changed file with 6 additions and 14 deletions.
diff --git 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 = {