public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: replace inkscape with inkscape_0

Browse Source 
The Inkscape CLI interface has been changed with 1.x and packages
are not adjusted yet to this change. Let's use inkscape 0.x instead.
This commit is contained in:
Pavol Rusnak 2020-05-05 13:14:00 +02:00
parent 5107b24c83
commit 8402a74cce
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
18 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/data/fonts/emojione/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, inkscape, imagemagick, potrace, svgo, scfbuild }: { stdenv, fetchFromGitHub, inkscape_0, imagemagick, potrace, svgo, scfbuild }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "emojione"; pname = "emojione";
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
export HOME="$NIX_BUILD_ROOT" export HOME="$NIX_BUILD_ROOT"
''; '';
nativeBuildInputs = [ inkscape imagemagick potrace svgo scfbuild ]; nativeBuildInputs = [ inkscape_0 imagemagick potrace svgo scfbuild ];
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/data/fonts/twemoji-color-font/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, inkscape, imagemagick, potrace, svgo, scfbuild }: { stdenv, fetchFromGitHub, inkscape_0, imagemagick, potrace, svgo, scfbuild }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "twemoji-color-font"; pname = "twemoji-color-font";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "00pbgqpkq21wl8fs0q1xp49xb10m48b9sz8cdc58flkd2vqfssw2"; sha256 = "00pbgqpkq21wl8fs0q1xp49xb10m48b9sz8cdc58flkd2vqfssw2";
}; };
nativeBuildInputs = [ inkscape imagemagick potrace svgo scfbuild ]; nativeBuildInputs = [ inkscape_0 imagemagick potrace svgo scfbuild ];
# silence inkscape errors about non-writable home # silence inkscape errors about non-writable home
preBuild = "export HOME=\"$NIX_BUILD_ROOT\""; preBuild = "export HOME=\"$NIX_BUILD_ROOT\"";
makeFlags = [ "SCFBUILD=${scfbuild}/bin/scfbuild" ]; makeFlags = [ "SCFBUILD=${scfbuild}/bin/scfbuild" ];

4
pkgs/data/icons/bibata-cursors/default.nix
View File

@ -1,4 +1,4 @@
{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }: { stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape_0, xcursorgen, python3 }:
let let
py = python3.withPackages(ps: [ ps.pillow ]); py = python3.withPackages(ps: [ ps.pillow ]);
@ -25,7 +25,7 @@ in stdenvNoCC.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
gnome-themes-extra gnome-themes-extra
inkscape inkscape_0
xcursorgen xcursorgen
py py
]; ];

4
pkgs/data/icons/bibata-cursors/extra.nix
View File

@ -1,4 +1,4 @@
{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }: { stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape_0, xcursorgen, python3 }:
let let
py = python3.withPackages(ps: [ ps.pillow ]); py = python3.withPackages(ps: [ ps.pillow ]);
@ -25,7 +25,7 @@ in stdenvNoCC.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
gnome-themes-extra gnome-themes-extra
inkscape inkscape_0
xcursorgen xcursorgen
py py
]; ];

4
pkgs/data/icons/bibata-cursors/translucent.nix
View File

@ -1,4 +1,4 @@
{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen }: { stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape_0, xcursorgen }:
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "bibata-cursors-translucent"; pname = "bibata-cursors-translucent";
@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
gnome-themes-extra gnome-themes-extra
inkscape inkscape_0
xcursorgen xcursorgen
]; ];

4
pkgs/data/icons/capitaine-cursors/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub { stdenv, fetchFromGitHub
, inkscape, xcursorgen, bc }: , inkscape_0, xcursorgen, bc }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "capitaine-cursors"; pname = "capitaine-cursors";
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
''; '';
buildInputs =[ buildInputs =[
inkscape inkscape_0
xcursorgen xcursorgen
bc bc
]; ];

4
pkgs/data/icons/numix-cursor-theme/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, inkscape, xcursorgen }: { stdenv, fetchFromGitHub, inkscape_0, xcursorgen }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.1"; version = "1.1";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "0p8h48wsy3z5dz9vdnp01fpn6q8ky0h74l5qgixlip557bsa1spi"; sha256 = "0p8h48wsy3z5dz9vdnp01fpn6q8ky0h74l5qgixlip557bsa1spi";
}; };
nativeBuildInputs = [ inkscape xcursorgen ]; nativeBuildInputs = [ inkscape_0 xcursorgen ];
buildPhase = '' buildPhase = ''
patchShebangs . patchShebangs .

4
pkgs/data/themes/adapta/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome3 }: { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, parallel, sassc, inkscape_0, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "adapta-gtk-theme"; pname = "adapta-gtk-theme";
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
pkgconfig pkgconfig
parallel parallel
sassc sassc
inkscape inkscape_0
libxml2 libxml2
glib.dev glib.dev
gnome3.gnome-shell gnome3.gnome-shell

4
pkgs/data/themes/arc/default.nix
View File

@ -7,7 +7,7 @@
, gnome3 , gnome3
, gtk-engine-murrine , gtk-engine-murrine
, optipng , optipng
, inkscape , inkscape_0
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
pkgconfig pkgconfig
sassc sassc
optipng optipng
inkscape inkscape_0
gtk3 gtk3
]; ];

6
pkgs/data/themes/mojave/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fetchurl, glib, gtk-engine-murrine, gtk_engines, inkscape, optipng, sassc, which }: { stdenv, fetchFromGitHub, fetchurl, glib, gtk-engine-murrine, gtk_engines, inkscape_0, optipng, sassc, which }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mojave-gtk-theme"; pname = "mojave-gtk-theme";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
sourceRoot = "source"; sourceRoot = "source";
nativeBuildInputs = [ glib inkscape optipng sassc which ]; nativeBuildInputs = [ glib inkscape_0 optipng sassc which ];
buildInputs = [ gtk_engines ]; buildInputs = [ gtk_engines ];
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
src/assets/xfwm4/render-assets.sh src/assets/xfwm4/render-assets.sh
do do
substituteInPlace $f \ substituteInPlace $f \
--replace /usr/bin/inkscape ${inkscape}/bin/inkscape \ --replace /usr/bin/inkscape ${inkscape_0}/bin/inkscape \
--replace /usr/bin/optipng ${optipng}/bin/optipng --replace /usr/bin/optipng ${optipng}/bin/optipng
done done

6
pkgs/data/themes/numix-solarized/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, python3, sass, glib, gdk-pixbuf, libxml2, { stdenv, fetchFromGitHub, python3, sass, glib, gdk-pixbuf, libxml2,
inkscape, optipng, gtk-engine-murrine inkscape_0, optipng, gtk-engine-murrine
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "1kda0lyqi3cxh163fbj8yyi6jj6pf0y980k4s0cmyi3hkh4cqyd5"; sha256 = "1kda0lyqi3cxh163fbj8yyi6jj6pf0y980k4s0cmyi3hkh4cqyd5";
}; };
nativeBuildInputs = [ python3 sass glib gdk-pixbuf libxml2 inkscape optipng ]; nativeBuildInputs = [ python3 sass glib gdk-pixbuf libxml2 inkscape_0 optipng ];
propagatedUserEnvPkgs = [ gtk-engine-murrine ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ];
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
patchShebangs . patchShebangs .
substituteInPlace Makefile --replace '$(DESTDIR)'/usr $out substituteInPlace Makefile --replace '$(DESTDIR)'/usr $out
substituteInPlace scripts/render-assets.sh \ substituteInPlace scripts/render-assets.sh \
--replace /usr/bin/inkscape ${inkscape}/bin/inkscape \ --replace /usr/bin/inkscape ${inkscape_0}/bin/inkscape \
--replace /usr/bin/optipng ${optipng}/bin/optipng --replace /usr/bin/optipng ${optipng}/bin/optipng
''; '';

4
pkgs/data/themes/plata/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, parallel { stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, parallel
, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine , sassc, inkscape_0, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine
, cinnamonSupport ? true , cinnamonSupport ? true
, gnomeFlashbackSupport ? true , gnomeFlashbackSupport ? true
, gnomeShellSupport ? true , gnomeShellSupport ? true
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
pkgconfig pkgconfig
parallel parallel
sassc sassc
inkscape inkscape_0
libxml2 libxml2
glib.dev glib.dev
] ]

8
pkgs/data/themes/pop-gtk/default.nix
View File

@ -4,7 +4,7 @@
, ninja , ninja
, sassc , sassc
, gtk3 , gtk3
, inkscape , inkscape_0
, optipng , optipng
, gtk-engine-murrine , gtk-engine-murrine
, gdk-pixbuf , gdk-pixbuf
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
ninja ninja
sassc sassc
gtk3 gtk3
inkscape inkscape_0
optipng optipng
python3 python3
]; ];
@ -48,9 +48,9 @@ stdenv.mkDerivation rec {
for file in $(find -name render-\*.sh); do for file in $(find -name render-\*.sh); do
substituteInPlace "$file" \ substituteInPlace "$file" \
--replace 'INKSCAPE="/usr/bin/inkscape"' \ --replace 'INKSCAPE="/usr/bin/inkscape"' \
'INKSCAPE="inkscape"' \ 'INKSCAPE="${inkscape_0}/bin/inkscape"' \
--replace 'OPTIPNG="/usr/bin/optipng"' \ --replace 'OPTIPNG="/usr/bin/optipng"' \
'OPTIPNG="optipng"' 'OPTIPNG="${optipng}/bin/optipng"'
done done
''; '';

4
pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
View File

@ -23,7 +23,7 @@
, docbook_xsl , docbook_xsl
, docbook_xml_dtd_42 , docbook_xml_dtd_42
, gobject-introspection , gobject-introspection
, inkscape , inkscape_0
, poppler_utils , poppler_utils
, desktop-file-utils , desktop-file-utils
, wrapGAppsHook , wrapGAppsHook
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
python3 python3
# building getting started # building getting started
inkscape inkscape_0
poppler_utils poppler_utils
]; ];

4
pkgs/desktops/mate/mate-utils/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape_0, udisks2, mate, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-utils"; pname = "mate-utils";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
pkgconfig pkgconfig
gettext gettext
itstool itstool
inkscape inkscape_0
wrapGAppsHook wrapGAppsHook
]; ];

4
pkgs/games/arx-libertatis/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, zlib, boost { stdenv, fetchFromGitHub, cmake, zlib, boost
, openal, glm, freetype, libGLU, SDL2, epoxy , openal, glm, freetype, libGLU, SDL2, epoxy
, dejavu_fonts, inkscape, optipng, imagemagick , dejavu_fonts, inkscape_0, optipng, imagemagick
, withCrashReporter ? !stdenv.isDarwin , withCrashReporter ? !stdenv.isDarwin
, qtbase ? null , qtbase ? null
, wrapQtAppsHook ? null , wrapQtAppsHook ? null
@ -22,7 +22,7 @@ stdenv.mkDerivation {
}; };
nativeBuildInputs = [ nativeBuildInputs = [
cmake inkscape imagemagick optipng cmake inkscape_0 imagemagick optipng
] ++ optionals withCrashReporter [ wrapQtAppsHook ]; ] ++ optionals withCrashReporter [ wrapQtAppsHook ];
buildInputs = [ buildInputs = [

4
pkgs/tools/graphics/fim/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, autoconf, automake, pkgconfig { stdenv, fetchurl, autoconf, automake, pkgconfig
, perl, flex, bison, readline, libexif , perl, flex, bison, readline, libexif
, x11Support ? true, SDL , x11Support ? true, SDL
, svgSupport ? true, inkscape , svgSupport ? true, inkscape_0
, asciiArtSupport ? true, aalib , asciiArtSupport ? true, aalib
, gifSupport ? true, giflib , gifSupport ? true, giflib
, tiffSupport ? true, libtiff , tiffSupport ? true, libtiff
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
buildInputs = with stdenv.lib; buildInputs = with stdenv.lib;
[ perl flex bison readline libexif ] [ perl flex bison readline libexif ]
++ optional x11Support SDL ++ optional x11Support SDL
++ optional svgSupport inkscape ++ optional svgSupport inkscape_0
++ optional asciiArtSupport aalib ++ optional asciiArtSupport aalib
++ optional gifSupport giflib ++ optional gifSupport giflib
++ optional tiffSupport libtiff ++ optional tiffSupport libtiff

6
pkgs/tools/typesetting/tex/dblatex/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, python2, libxslt, texlive { stdenv, fetchurl, python2, libxslt, texlive
, enableAllFeatures ? false, imagemagick ? null, transfig ? null, inkscape ? null, fontconfig ? null, ghostscript ? null , enableAllFeatures ? false, imagemagick ? null, transfig ? null, inkscape_0 ? null, fontconfig ? null, ghostscript ? null
, tex ? texlive.combine { # satisfy all packages that ./configure mentions , tex ? texlive.combine { # satisfy all packages that ./configure mentions
inherit (texlive) scheme-basic epstopdf anysize appendix changebar inherit (texlive) scheme-basic epstopdf anysize appendix changebar
@ -16,7 +16,7 @@
assert enableAllFeatures -> assert enableAllFeatures ->
imagemagick != null && imagemagick != null &&
transfig != null && transfig != null &&
inkscape != null && inkscape_0 != null &&
fontconfig != null && fontconfig != null &&
ghostscript != null; ghostscript != null;
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
-e 's|Popen("pdflatex|Popen("${tex}/bin/pdflatex|g' \ -e 's|Popen("pdflatex|Popen("${tex}/bin/pdflatex|g' \
-e 's|"fc-match"|"${fontconfig.bin}/bin/fc-match"|g' \ -e 's|"fc-match"|"${fontconfig.bin}/bin/fc-match"|g' \
-e 's|"fc-list"|"${fontconfig.bin}/bin/fc-list"|g' \ -e 's|"fc-list"|"${fontconfig.bin}/bin/fc-list"|g' \
-e 's|cmd = "inkscape|cmd = "${inkscape}/bin/inkscape|g' \ -e 's|cmd = "inkscape|cmd = "${inkscape_0}/bin/inkscape|g' \
-e 's|cmd = "fig2dev|cmd = "${transfig}/bin/fig2dev|g' \ -e 's|cmd = "fig2dev|cmd = "${transfig}/bin/fig2dev|g' \
-e 's|cmd = \["ps2pdf|cmd = ["${ghostscript}/bin/ps2pdf|g' \ -e 's|cmd = \["ps2pdf|cmd = ["${ghostscript}/bin/ps2pdf|g' \
-e 's|cmd = "convert|cmd = "${imagemagick.out}/bin/convert|g' \ -e 's|cmd = "convert|cmd = "${imagemagick.out}/bin/convert|g' \