diff options
| author | Will Dietz <github@wdtz.org> | 2019-02-12 10:08:01 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-12 10:08:01 -0600 |
| commit | 91c7157919081c5bbc8cb808e27d89ed4a8cbef7 (patch) | |
| tree | 3ecab64df26b1201181ecc1413ba54e675e27c29 /pkgs | |
| parent | 92a54bd927cc370f8186f7525619f306f94d564c (diff) | |
| parent | f1fda2eab3fe589504c7c226b264640aaf9d5ebb (diff) | |
| download | nixpkgs-91c7157919081c5bbc8cb808e27d89ed4a8cbef7.tar nixpkgs-91c7157919081c5bbc8cb808e27d89ed4a8cbef7.tar.gz nixpkgs-91c7157919081c5bbc8cb808e27d89ed4a8cbef7.tar.bz2 nixpkgs-91c7157919081c5bbc8cb808e27d89ed4a8cbef7.tar.lz nixpkgs-91c7157919081c5bbc8cb808e27d89ed4a8cbef7.tar.xz nixpkgs-91c7157919081c5bbc8cb808e27d89ed4a8cbef7.tar.zst nixpkgs-91c7157919081c5bbc8cb808e27d89ed4a8cbef7.zip | |
Merge pull request #55214 from dtzWill/update/ipe-7.2.10
ipe: 7.2.9 -> 7.2.10
Diffstat (limited to 'pkgs')
| -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 = { |