diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-02-24 01:09:00 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-02-24 01:09:00 +0000 |
| commit | 072c01a28f865e9487df09aed7ddff328252fb36 (patch) | |
| tree | 6df6e652915940255f294ed8998cce1c4c7c2d40 /nixpkgs/pkgs/applications/graphics/ipe | |
| parent | 024b46ff20027c15322e5d868ecec42632556d4b (diff) | |
| parent | 969cff2691a02b3d7e5468beda26c482d8986644 (diff) | |
| download | nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar.gz nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar.bz2 nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar.lz nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar.xz nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar.zst nixlib-072c01a28f865e9487df09aed7ddff328252fb36.zip | |
Merge commit '969cff2691a02b3d7e5468beda26c482d8986644'
Diffstat (limited to 'nixpkgs/pkgs/applications/graphics/ipe')
| -rw-r--r-- | nixpkgs/pkgs/applications/graphics/ipe/default.nix | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/applications/graphics/ipe/default.nix b/nixpkgs/pkgs/applications/graphics/ipe/default.nix index ee5c348eb6be..140227eb9eca 100644 --- a/nixpkgs/pkgs/applications/graphics/ipe/default.nix +++ b/nixpkgs/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 = { |