The first problem that was introduced in a276d5160c
was a linking error:
ld: cannot find -licui18n
ld: cannot find -licuuc
ld: cannot find -licudata
So I added icu to the buildInputs.
The second problem was that the interpreter wasn't patched in
share/filters, apparently this is only needed when building with
autotools:
make[3]: Entering directory '/build/inkscape-0.92.3/share/filters'
./i18n.py ./filters.svg > ./filters.svg.h
./i18n.py: /usr/bin/env: bad interpreter: No such file or directory
A similar error also occurs for share/palettes, share/patterns,
share/symbols and share/templates, so I added patching the interpreter
there as well.
Switching to autotools in Inkscape is a very bad idea, because upstream
currently still has their own autotools files in the 0.92.x tree but
master already has them removed, see this commit:
e471a664f9
However for the sake of trying to not break Inkscape on Darwin again,
I tried to keep the fixes minimal and not went back to CMake.
I did however mark the stuff that's unneeded for CMake, so that we can
avoid forgetting to remove that crap once we get back to CMake.
Signed-off-by: aszlig <aszlig@nix.build>
Cc: @matthewbauer
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:
- built on NixOS
- ran `/nix/store/5khy2kbfjwvkj42lr6z0cvnd17xkfrfg-inkscape-0.92.3/bin/inkscape -h` got 0 exit code
- ran `/nix/store/5khy2kbfjwvkj42lr6z0cvnd17xkfrfg-inkscape-0.92.3/bin/inkscape --help` got 0 exit code
- ran `/nix/store/5khy2kbfjwvkj42lr6z0cvnd17xkfrfg-inkscape-0.92.3/bin/inkscape -V` and found version 0.92.3
- ran `/nix/store/5khy2kbfjwvkj42lr6z0cvnd17xkfrfg-inkscape-0.92.3/bin/inkscape --version` and found version 0.92.3
- found 0.92.3 with grep in /nix/store/5khy2kbfjwvkj42lr6z0cvnd17xkfrfg-inkscape-0.92.3
This now also includes support vor visio and cdr and also adds the
missing dependency on libexif.
Forcing -lX11 in NIX_LDFLAGS is no longer needed in 0.91, so we drop
that as well as the patch and the --with-python configure flag, which is
now no longer even valid.
Tests now seem to run fine without -j1 as well.
I also tested it against the DXF test file mentioned in #3449, to be
sure we don't regress here.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Some of these should be longDescriptions, but most others just
shouldn't contain newlines. E.g. write
description = "Bla";
and not
description = ''
Bla
'';
This pollutes "nix-env -qa --description" output.
svn path=/nixpkgs/trunk/; revision=14310
URLs to http://nix.cs.uu.nl/dist/tarballs. With content-addressable
mirror support (r9190, NIXPKGS-70) this is no longer necessary:
fetchurl will try to download from that location automatically. So
we can keep the original URLs.
svn path=/nixpkgs/trunk/; revision=9192
aszlig