diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-02-13 12:33:29 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-02-13 12:33:29 +0100 |
commit | 7257dedd7cf28634e08fc0458ed34a183065b70e (patch) | |
tree | 53d0274ecfd0474666bceec021ce059e428a4b47 /pkgs/applications/graphics | |
parent | 7c3588d8ddc35909ca56394c3a5464d6e1551fe0 (diff) | |
parent | 563b491ce89bafaa928beba19a37f6381bfc60d0 (diff) | |
download | nixpkgs-7257dedd7cf28634e08fc0458ed34a183065b70e.tar nixpkgs-7257dedd7cf28634e08fc0458ed34a183065b70e.tar.gz nixpkgs-7257dedd7cf28634e08fc0458ed34a183065b70e.tar.bz2 nixpkgs-7257dedd7cf28634e08fc0458ed34a183065b70e.tar.lz nixpkgs-7257dedd7cf28634e08fc0458ed34a183065b70e.tar.xz nixpkgs-7257dedd7cf28634e08fc0458ed34a183065b70e.tar.zst nixpkgs-7257dedd7cf28634e08fc0458ed34a183065b70e.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/ipe/default.nix | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index ee5c348eb6b..140227eb9ec 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 = { |