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-07-19 13:10:16 +02:00
parent 5107b24c83
commit 8402a74cce
18 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/data/fonts/emojione/default.nix
+2 -2
View File
@@ -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;
pkgs/data/fonts/twemoji-color-font/default.nix
+2 -2
View File
@@ -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" ];
pkgs/data/icons/bibata-cursors/default.nix
+2 -2
View File
@@ -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
];
pkgs/data/icons/bibata-cursors/extra.nix
+2 -2
View File
@@ -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
];
pkgs/data/icons/bibata-cursors/translucent.nix
+2 -2
View File
@@ -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
];
pkgs/data/icons/capitaine-cursors/default.nix
+2 -2
View File
@@ -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
];
pkgs/data/icons/numix-cursor-theme/default.nix
+2 -2
View File
@@ -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 .
pkgs/data/themes/adapta/default.nix
+2 -2
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 {
pname = "adapta-gtk-theme";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
pkgconfig
parallel
sassc
inkscape
inkscape_0
libxml2
glib.dev
gnome3.gnome-shell
pkgs/data/themes/arc/default.nix
+2 -2
View File
@@ -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
];
pkgs/data/themes/mojave/default.nix
+3 -3
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 {
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
pkgs/data/themes/numix-solarized/default.nix
+3 -3
View File
@@ -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
'';
pkgs/data/themes/plata/default.nix
+2 -2
View File
@@ -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
]
pkgs/data/themes/pop-gtk/default.nix
+4 -4
View File
@@ -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
'';