inkscape: format with nixpkgs-fmt
Also order the build inputs alphabetically and switch to pname+version.
This commit is contained in:
parent
38e316d398
commit
eff936e8b9
@ -1,21 +1,53 @@
|
|||||||
{ stdenv, fetchurl, fetchpatch, pkgconfig, perlPackages, libXft
|
{ stdenv
|
||||||
, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2
|
, boehmgc
|
||||||
, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper
|
, boost
|
||||||
, gsl, gtkspell2, cairo, python2, poppler, imagemagick, libwpg, librevenge
|
, cairo
|
||||||
, libvisio, libcdr, libexif, potrace, cmake
|
, cmake
|
||||||
, librsvg, wrapGAppsHook
|
, fetchpatch
|
||||||
|
, fetchurl
|
||||||
|
, gettext
|
||||||
|
, glib
|
||||||
|
, glibmm
|
||||||
|
, gsl
|
||||||
|
, gtkmm2
|
||||||
|
, gtkspell2
|
||||||
|
, imagemagick
|
||||||
|
, lcms
|
||||||
|
, libcdr
|
||||||
|
, libexif
|
||||||
|
, libpng
|
||||||
|
, librevenge
|
||||||
|
, librsvg
|
||||||
|
, libsigcxx
|
||||||
|
, libvisio
|
||||||
|
, libwpg
|
||||||
|
, libXft
|
||||||
|
, libxml2
|
||||||
|
, libxslt
|
||||||
|
, makeWrapper
|
||||||
|
, perlPackages
|
||||||
|
, pkg-config
|
||||||
|
, poppler
|
||||||
|
, popt
|
||||||
|
, potrace
|
||||||
|
, python2
|
||||||
|
, wrapGAppsHook
|
||||||
|
, zlib
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
python2Env = python2.withPackages(ps: with ps;
|
python2Env = python2.withPackages
|
||||||
[ numpy lxml scour ]);
|
(ps: with ps; [
|
||||||
|
numpy
|
||||||
|
lxml
|
||||||
|
scour
|
||||||
|
]);
|
||||||
in
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "inkscape-0.92.4";
|
pname = "inkscape";
|
||||||
|
version = "0.92.4";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://media.inkscape.org/dl/resources/file/${name}.tar.bz2";
|
url = "https://media.inkscape.org/dl/resources/file/${pname}-${version}.tar.bz2";
|
||||||
sha256 = "0pjinhjibfsz1aywdpgpj3k23xrsszpj4a1ya5562dkv2yl2vv2p";
|
sha256 = "0pjinhjibfsz1aywdpgpj3k23xrsszpj4a1ya5562dkv2yl2vv2p";
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -53,19 +85,49 @@ stdenv.mkDerivation rec {
|
|||||||
--replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"'
|
--replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig cmake makeWrapper python2Env wrapGAppsHook ]
|
nativeBuildInputs = [
|
||||||
++ (with perlPackages; [ perl XMLParser ]);
|
pkg-config
|
||||||
|
cmake
|
||||||
|
makeWrapper
|
||||||
|
python2Env
|
||||||
|
wrapGAppsHook
|
||||||
|
] ++ (with perlPackages; [
|
||||||
|
perl
|
||||||
|
XMLParser
|
||||||
|
]);
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
libXft libpng zlib popt boehmgc
|
boehmgc
|
||||||
libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext
|
boost
|
||||||
gsl poppler imagemagick libwpg librevenge
|
gettext
|
||||||
libvisio libcdr libexif potrace
|
glib
|
||||||
|
glibmm
|
||||||
|
gsl
|
||||||
|
gtkmm2
|
||||||
|
imagemagick
|
||||||
|
lcms
|
||||||
|
libcdr
|
||||||
|
libexif
|
||||||
|
libpng
|
||||||
|
librevenge
|
||||||
librsvg # for loading icons
|
librsvg # for loading icons
|
||||||
|
libsigcxx
|
||||||
python2Env perlPackages.perl
|
libvisio
|
||||||
] ++ stdenv.lib.optional (!stdenv.isDarwin) gtkspell2
|
libwpg
|
||||||
++ stdenv.lib.optional stdenv.isDarwin cairo;
|
libXft
|
||||||
|
libxml2
|
||||||
|
libxslt
|
||||||
|
perlPackages.perl
|
||||||
|
poppler
|
||||||
|
popt
|
||||||
|
potrace
|
||||||
|
python2Env
|
||||||
|
zlib
|
||||||
|
] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
|
||||||
|
gtkspell2
|
||||||
|
] ++ stdenv.lib.optionals stdenv.isDarwin [
|
||||||
|
cairo
|
||||||
|
];
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user