summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavol Rusnak <pavol@rusnak.io>2020-05-05 13:14:00 +0200
committerPavol Rusnak <pavol@rusnak.io>2020-07-19 13:10:16 +0200
commit8402a74cce2216de0fd2cce4e5fd897e5dedd450 (patch)
tree3b20025467d3f3c8f042ef138e4139eea77d27f2
parent5107b24c83a4c93df9ff25bc76ef64f5883720f9 (diff)
treewide: replace inkscape with inkscape_0
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.
-rw-r--r--pkgs/data/fonts/emojione/default.nix4
-rw-r--r--pkgs/data/fonts/twemoji-color-font/default.nix4
-rw-r--r--pkgs/data/icons/bibata-cursors/default.nix4
-rw-r--r--pkgs/data/icons/bibata-cursors/extra.nix4
-rw-r--r--pkgs/data/icons/bibata-cursors/translucent.nix4
-rw-r--r--pkgs/data/icons/capitaine-cursors/default.nix4
-rw-r--r--pkgs/data/icons/numix-cursor-theme/default.nix4
-rw-r--r--pkgs/data/themes/adapta/default.nix4
-rw-r--r--pkgs/data/themes/arc/default.nix4
-rw-r--r--pkgs/data/themes/mojave/default.nix6
-rw-r--r--pkgs/data/themes/numix-solarized/default.nix6
-rw-r--r--pkgs/data/themes/plata/default.nix4
-rw-r--r--pkgs/data/themes/pop-gtk/default.nix8
-rw-r--r--pkgs/desktops/gnome-3/apps/gnome-documents/default.nix4
-rw-r--r--pkgs/desktops/mate/mate-utils/default.nix4
-rw-r--r--pkgs/games/arx-libertatis/default.nix4
-rw-r--r--pkgs/tools/graphics/fim/default.nix4
-rw-r--r--pkgs/tools/typesetting/tex/dblatex/default.nix6
18 files changed, 41 insertions, 41 deletions
diff --git a/pkgs/data/fonts/emojione/default.nix b/pkgs/data/fonts/emojione/default.nix
index 6f5168e90d5e..71bd2216da2d 100644
--- a/pkgs/data/fonts/emojione/default.nix
+++ b/pkgs/data/fonts/emojione/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, inkscape, imagemagick, potrace, svgo, scfbuild }:
+{ stdenv, fetchFromGitHub, inkscape_0, imagemagick, potrace, svgo, scfbuild }:
stdenv.mkDerivation rec {
pname = "emojione";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
export HOME="$NIX_BUILD_ROOT"
'';
- nativeBuildInputs = [ inkscape imagemagick potrace svgo scfbuild ];
+ nativeBuildInputs = [ inkscape_0 imagemagick potrace svgo scfbuild ];
enableParallelBuilding = true;
diff --git a/pkgs/data/fonts/twemoji-color-font/default.nix b/pkgs/data/fonts/twemoji-color-font/default.nix
index a9bf3720c071..ed04aa78ae16 100644
--- a/pkgs/data/fonts/twemoji-color-font/default.nix
+++ b/pkgs/data/fonts/twemoji-color-font/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, inkscape, imagemagick, potrace, svgo, scfbuild }:
+{ stdenv, fetchFromGitHub, inkscape_0, imagemagick, potrace, svgo, scfbuild }:
stdenv.mkDerivation rec {
pname = "twemoji-color-font";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "00pbgqpkq21wl8fs0q1xp49xb10m48b9sz8cdc58flkd2vqfssw2";
};
- nativeBuildInputs = [ inkscape imagemagick potrace svgo scfbuild ];
+ nativeBuildInputs = [ inkscape_0 imagemagick potrace svgo scfbuild ];
# silence inkscape errors about non-writable home
preBuild = "export HOME=\"$NIX_BUILD_ROOT\"";
makeFlags = [ "SCFBUILD=${scfbuild}/bin/scfbuild" ];
diff --git a/pkgs/data/icons/bibata-cursors/default.nix b/pkgs/data/icons/bibata-cursors/default.nix
index 66ed71f1f9ec..670746d5d1a6 100644
--- a/pkgs/data/icons/bibata-cursors/default.nix
+++ b/pkgs/data/icons/bibata-cursors/default.nix
@@ -1,4 +1,4 @@
-{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }:
+{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape_0, xcursorgen, python3 }:
let
py = python3.withPackages(ps: [ ps.pillow ]);
@@ -25,7 +25,7 @@ in stdenvNoCC.mkDerivation rec {
nativeBuildInputs = [
gnome-themes-extra
- inkscape
+ inkscape_0
xcursorgen
py
];
diff --git a/pkgs/data/icons/bibata-cursors/extra.nix b/pkgs/data/icons/bibata-cursors/extra.nix
index 7977566cb613..c353a049f078 100644
--- a/pkgs/data/icons/bibata-cursors/extra.nix
+++ b/pkgs/data/icons/bibata-cursors/extra.nix
@@ -1,4 +1,4 @@
-{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen, python3 }:
+{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape_0, xcursorgen, python3 }:
let
py = python3.withPackages(ps: [ ps.pillow ]);
@@ -25,7 +25,7 @@ in stdenvNoCC.mkDerivation rec {
nativeBuildInputs = [
gnome-themes-extra
- inkscape
+ inkscape_0
xcursorgen
py
];
diff --git a/pkgs/data/icons/bibata-cursors/translucent.nix b/pkgs/data/icons/bibata-cursors/translucent.nix
index 90e1102e124c..4b215d071ab5 100644
--- a/pkgs/data/icons/bibata-cursors/translucent.nix
+++ b/pkgs/data/icons/bibata-cursors/translucent.nix
@@ -1,4 +1,4 @@
-{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape, xcursorgen }:
+{ stdenvNoCC, fetchFromGitHub, gnome-themes-extra, inkscape_0, xcursorgen }:
stdenvNoCC.mkDerivation rec {
pname = "bibata-cursors-translucent";
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation rec {
nativeBuildInputs = [
gnome-themes-extra
- inkscape
+ inkscape_0
xcursorgen
];
diff --git a/pkgs/data/icons/capitaine-cursors/default.nix b/pkgs/data/icons/capitaine-cursors/default.nix
index 09491b904ef1..73ae4fe915ff 100644
--- a/pkgs/data/icons/capitaine-cursors/default.nix
+++ b/pkgs/data/icons/capitaine-cursors/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub
-, inkscape, xcursorgen, bc }:
+, inkscape_0, xcursorgen, bc }:
stdenv.mkDerivation rec {
pname = "capitaine-cursors";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
'';
buildInputs =[
- inkscape
+ inkscape_0
xcursorgen
bc
];
diff --git a/pkgs/data/icons/numix-cursor-theme/default.nix b/pkgs/data/icons/numix-cursor-theme/default.nix
index d0411a8c5697..6445628e9bb2 100644
--- a/pkgs/data/icons/numix-cursor-theme/default.nix
+++ b/pkgs/data/icons/numix-cursor-theme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, inkscape, xcursorgen }:
+{ stdenv, fetchFromGitHub, inkscape_0, xcursorgen }:
stdenv.mkDerivation rec {
version = "1.1";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "0p8h48wsy3z5dz9vdnp01fpn6q8ky0h74l5qgixlip557bsa1spi";
};
- nativeBuildInputs = [ inkscape xcursorgen ];
+ nativeBuildInputs = [ inkscape_0 xcursorgen ];
buildPhase = ''
patchShebangs .
diff --git a/pkgs/data/themes/adapta/default.nix b/pkgs/data/themes/adapta/default.nix
index ca8e908009f9..a9a80143fc9d 100644
--- a/pkgs/data/themes/adapta/default.nix
+++ b/pkgs/data/themes/adapta/default.nix
@@ -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 {
pname = "adapta-gtk-theme";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
pkgconfig
parallel
sassc
- inkscape
+ inkscape_0
libxml2
glib.dev
gnome3.gnome-shell
diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix
index 9fba432656a7..ff20efd816bb 100644
--- a/pkgs/data/themes/arc/default.nix
+++ b/pkgs/data/themes/arc/default.nix
@@ -7,7 +7,7 @@
, gnome3
, gtk-engine-murrine
, optipng
-, inkscape
+, inkscape_0
}:
stdenv.mkDerivation rec {
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
pkgconfig
sassc
optipng
- inkscape
+ inkscape_0
gtk3
];
diff --git a/pkgs/data/themes/mojave/default.nix b/pkgs/data/themes/mojave/default.nix
index 751dd690d114..a98218b63925 100644
--- a/pkgs/data/themes/mojave/default.nix
+++ b/pkgs/data/themes/mojave/default.nix
@@ -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 {
pname = "mojave-gtk-theme";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
sourceRoot = "source";
- nativeBuildInputs = [ glib inkscape optipng sassc which ];
+ nativeBuildInputs = [ glib inkscape_0 optipng sassc which ];
buildInputs = [ gtk_engines ];
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
src/assets/xfwm4/render-assets.sh
do
substituteInPlace $f \
- --replace /usr/bin/inkscape ${inkscape}/bin/inkscape \
+ --replace /usr/bin/inkscape ${inkscape_0}/bin/inkscape \
--replace /usr/bin/optipng ${optipng}/bin/optipng
done
diff --git a/pkgs/data/themes/numix-solarized/default.nix b/pkgs/data/themes/numix-solarized/default.nix
index ae8a1d7145e7..a3da60e243ec 100644
--- a/pkgs/data/themes/numix-solarized/default.nix
+++ b/pkgs/data/themes/numix-solarized/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, python3, sass, glib, gdk-pixbuf, libxml2,
- inkscape, optipng, gtk-engine-murrine
+ inkscape_0, optipng, gtk-engine-murrine
}:
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
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 ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
patchShebangs .
substituteInPlace Makefile --replace '$(DESTDIR)'/usr $out
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
'';
diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix
index 6437bb1543d3..2e23e9a5bbec 100644
--- a/pkgs/data/themes/plata/default.nix
+++ b/pkgs/data/themes/plata/default.nix
@@ -1,5 +1,5 @@
{ 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
, gnomeFlashbackSupport ? true
, gnomeShellSupport ? true
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
pkgconfig
parallel
sassc
- inkscape
+ inkscape_0
libxml2
glib.dev
]
diff --git a/pkgs/data/themes/pop-gtk/default.nix b/pkgs/data/themes/pop-gtk/default.nix
index 730f7754d8f5..244240dde9f7 100644
--- a/pkgs/data/themes/pop-gtk/default.nix
+++ b/pkgs/data/themes/pop-gtk/default.nix
@@ -4,7 +4,7 @@
, ninja
, sassc
, gtk3
-, inkscape
+, inkscape_0
, optipng
, gtk-engine-murrine
, gdk-pixbuf
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
ninja
sassc
gtk3
- inkscape
+ inkscape_0
optipng
python3
];
@@ -48,9 +48,9 @@ stdenv.mkDerivation rec {
for file in $(find -name render-\*.sh); do
substituteInPlace "$file" \
--replace 'INKSCAPE="/usr/bin/inkscape"' \
- 'INKSCAPE="inkscape"' \
+ 'INKSCAPE="${inkscape_0}/bin/inkscape"' \
--replace 'OPTIPNG="/usr/bin/optipng"' \
- 'OPTIPNG="optipng"'
+ 'OPTIPNG="${optipng}/bin/optipng"'
done
'';
diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
index 8d5501537a0f..8d1208d4c686 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
@@ -23,7 +23,7 @@
, docbook_xsl
, docbook_xml_dtd_42
, gobject-introspection
-, inkscape
+, inkscape_0
, poppler_utils
, desktop-file-utils
, wrapGAppsHook
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
python3
# building getting started
- inkscape
+ inkscape_0
poppler_utils
];
diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix
index e36ff69a6fa7..35ff2635bbdc 100644
--- a/pkgs/desktops/mate/mate-utils/default.nix
+++ b/pkgs/desktops/mate/mate-utils/default.nix
@@ -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 {
pname = "mate-utils";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
pkgconfig
gettext
itstool
- inkscape
+ inkscape_0
wrapGAppsHook
];
diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix
index 8b2cf83e5099..2e60f81f4d31 100644
--- a/pkgs/games/arx-libertatis/default.nix
+++ b/pkgs/games/arx-libertatis/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, zlib, boost
, openal, glm, freetype, libGLU, SDL2, epoxy
-, dejavu_fonts, inkscape, optipng, imagemagick
+, dejavu_fonts, inkscape_0, optipng, imagemagick
, withCrashReporter ? !stdenv.isDarwin
, qtbase ? null
, wrapQtAppsHook ? null
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [
- cmake inkscape imagemagick optipng
+ cmake inkscape_0 imagemagick optipng
] ++ optionals withCrashReporter [ wrapQtAppsHook ];
buildInputs = [
diff --git a/pkgs/tools/graphics/fim/default.nix b/pkgs/tools/graphics/fim/default.nix
index 6a3d9a29db37..dd2dcc1f5bf1 100644
--- a/pkgs/tools/graphics/fim/default.nix
+++ b/pkgs/tools/graphics/fim/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, autoconf, automake, pkgconfig
, perl, flex, bison, readline, libexif
, x11Support ? true, SDL
-, svgSupport ? true, inkscape
+, svgSupport ? true, inkscape_0
, asciiArtSupport ? true, aalib
, gifSupport ? true, giflib
, tiffSupport ? true, libtiff
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
buildInputs = with stdenv.lib;
[ perl flex bison readline libexif ]
++ optional x11Support SDL
- ++ optional svgSupport inkscape
+ ++ optional svgSupport inkscape_0
++ optional asciiArtSupport aalib
++ optional gifSupport giflib
++ optional tiffSupport libtiff
diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix
index 1f6939e1b11c..5fde58251e02 100644
--- a/pkgs/tools/typesetting/tex/dblatex/default.nix
+++ b/pkgs/tools/typesetting/tex/dblatex/default.nix
@@ -1,5 +1,5 @@
{ 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
inherit (texlive) scheme-basic epstopdf anysize appendix changebar
@@ -16,7 +16,7 @@
assert enableAllFeatures ->
imagemagick != null &&
transfig != null &&
- inkscape != null &&
+ inkscape_0 != null &&
fontconfig != null &&
ghostscript != null;
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
-e 's|Popen("pdflatex|Popen("${tex}/bin/pdflatex|g' \
-e 's|"fc-match"|"${fontconfig.bin}/bin/fc-match"|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 = \["ps2pdf|cmd = ["${ghostscript}/bin/ps2pdf|g' \
-e 's|cmd = "convert|cmd = "${imagemagick.out}/bin/convert|g' \