diff options
author | Pavol Rusnak <pavol@rusnak.io> | 2020-05-05 13:14:00 +0200 |
---|---|---|
committer | Pavol Rusnak <pavol@rusnak.io> | 2020-07-19 13:10:16 +0200 |
commit | 8402a74cce2216de0fd2cce4e5fd897e5dedd450 (patch) | |
tree | 3b20025467d3f3c8f042ef138e4139eea77d27f2 /pkgs/data/themes | |
parent | 5107b24c83a4c93df9ff25bc76ef64f5883720f9 (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.
Diffstat (limited to 'pkgs/data/themes')
-rw-r--r-- | pkgs/data/themes/adapta/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/themes/arc/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/themes/mojave/default.nix | 6 | ||||
-rw-r--r-- | pkgs/data/themes/numix-solarized/default.nix | 6 | ||||
-rw-r--r-- | pkgs/data/themes/plata/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/themes/pop-gtk/default.nix | 8 |
6 files changed, 16 insertions, 16 deletions
diff --git a/pkgs/data/themes/adapta/default.nix b/pkgs/data/themes/adapta/default.nix index ca8e908009f90..a9a80143fc9d9 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 9fba432656a7a..ff20efd816bba 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 751dd690d1142..a98218b63925c 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 ae8a1d7145e7e..a3da60e243ece 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 6437bb1543d3c..2e23e9a5bbec8 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 730f7754d8f56..244240dde9f70 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 ''; |