diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-04-13 22:05:03 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2020-04-14 02:05:33 +0200 |
commit | eff936e8b94c6af4ee724c094bfec69b802a99b5 (patch) | |
tree | 745c0a2bfb677df49ba5efa4c2202cdb981871a3 /pkgs/applications | |
parent | 38e316d398a942fa896ed52c58d043315c95a140 (diff) | |
download | nixlib-eff936e8b94c6af4ee724c094bfec69b802a99b5.tar nixlib-eff936e8b94c6af4ee724c094bfec69b802a99b5.tar.gz nixlib-eff936e8b94c6af4ee724c094bfec69b802a99b5.tar.bz2 nixlib-eff936e8b94c6af4ee724c094bfec69b802a99b5.tar.lz nixlib-eff936e8b94c6af4ee724c094bfec69b802a99b5.tar.xz nixlib-eff936e8b94c6af4ee724c094bfec69b802a99b5.tar.zst nixlib-eff936e8b94c6af4ee724c094bfec69b802a99b5.zip |
inkscape: format with nixpkgs-fmt
Also order the build inputs alphabetically and switch to pname+version.
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/graphics/inkscape/default.nix | 108 |
1 files changed, 85 insertions, 23 deletions
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 4cfc6cb41848..512455c8b13f 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -1,21 +1,53 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, perlPackages, libXft -, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2 -, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper -, gsl, gtkspell2, cairo, python2, poppler, imagemagick, libwpg, librevenge -, libvisio, libcdr, libexif, potrace, cmake -, librsvg, wrapGAppsHook +{ stdenv +, boehmgc +, boost +, cairo +, cmake +, 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 - python2Env = python2.withPackages(ps: with ps; - [ numpy lxml scour ]); + python2Env = python2.withPackages + (ps: with ps; [ + numpy + lxml + scour + ]); in - stdenv.mkDerivation rec { - name = "inkscape-0.92.4"; + pname = "inkscape"; + version = "0.92.4"; 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"; }; @@ -53,19 +85,49 @@ stdenv.mkDerivation rec { --replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"' ''; - nativeBuildInputs = [ pkgconfig cmake makeWrapper python2Env wrapGAppsHook ] - ++ (with perlPackages; [ perl XMLParser ]); - buildInputs = [ - libXft libpng zlib popt boehmgc - libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext - gsl poppler imagemagick libwpg librevenge - libvisio libcdr libexif potrace + nativeBuildInputs = [ + pkg-config + cmake + makeWrapper + python2Env + wrapGAppsHook + ] ++ (with perlPackages; [ + perl + XMLParser + ]); + buildInputs = [ + boehmgc + boost + gettext + glib + glibmm + gsl + gtkmm2 + imagemagick + lcms + libcdr + libexif + libpng + librevenge librsvg # for loading icons - - python2Env perlPackages.perl - ] ++ stdenv.lib.optional (!stdenv.isDarwin) gtkspell2 - ++ stdenv.lib.optional stdenv.isDarwin cairo; + libsigcxx + libvisio + libwpg + libXft + libxml2 + libxslt + perlPackages.perl + poppler + popt + potrace + python2Env + zlib + ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + gtkspell2 + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + cairo + ]; enableParallelBuilding = true; |