diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-09-10 20:38:25 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2020-09-10 20:46:55 +0200 |
commit | 35deaa45a182d18858ae56c300ab786bdb6cb621 (patch) | |
tree | 8db1c1bd0560364b99022acb1bda197bfca26a3a /pkgs/data/themes | |
parent | a45e68be364d751414a406bf78fadf9b60f8c606 (diff) |
inkscape_0: drop
Inkscape 1.0.1 re-added the old CLI flags: https://gitlab.com/inkscape/inkscape/-/commit/3ca6a4ed08405f2a530a9ed3065f77443f9f7ebe
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 | 6 |
6 files changed, 15 insertions, 15 deletions
diff --git a/pkgs/data/themes/adapta/default.nix b/pkgs/data/themes/adapta/default.nix index a9a80143fc9d9..ca8e908009f90 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_0, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome3 }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, parallel, sassc, inkscape, 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_0 + inkscape libxml2 glib.dev gnome3.gnome-shell diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index 46664eaaf5836..66be070bdf4a2 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_0 +, inkscape , cinnamon }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pkgconfig sassc optipng - inkscape_0 + inkscape gtk3 ]; diff --git a/pkgs/data/themes/mojave/default.nix b/pkgs/data/themes/mojave/default.nix index a98218b63925c..751dd690d1142 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_0, optipng, sassc, which }: +{ stdenv, fetchFromGitHub, fetchurl, glib, gtk-engine-murrine, gtk_engines, inkscape, optipng, sassc, which }: stdenv.mkDerivation rec { pname = "mojave-gtk-theme"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sourceRoot = "source"; - nativeBuildInputs = [ glib inkscape_0 optipng sassc which ]; + nativeBuildInputs = [ glib inkscape 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_0}/bin/inkscape \ + --replace /usr/bin/inkscape ${inkscape}/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 a3da60e243ece..ae8a1d7145e7e 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_0, optipng, gtk-engine-murrine + inkscape, optipng, gtk-engine-murrine }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1kda0lyqi3cxh163fbj8yyi6jj6pf0y980k4s0cmyi3hkh4cqyd5"; }; - nativeBuildInputs = [ python3 sass glib gdk-pixbuf libxml2 inkscape_0 optipng ]; + nativeBuildInputs = [ python3 sass glib gdk-pixbuf libxml2 inkscape 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_0}/bin/inkscape \ + --replace /usr/bin/inkscape ${inkscape}/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 2e23e9a5bbec8..6437bb1543d3c 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_0, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine +, sassc, inkscape, 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_0 + inkscape libxml2 glib.dev ] diff --git a/pkgs/data/themes/pop-gtk/default.nix b/pkgs/data/themes/pop-gtk/default.nix index feb2ddebb3933..317d0ba860194 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_0 +, inkscape , optipng , gtk-engine-murrine , gdk-pixbuf @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ninja sassc gtk3 - inkscape_0 + inkscape optipng python3 ]; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { for file in $(find -name render-\*.sh); do substituteInPlace "$file" \ --replace 'INKSCAPE="/usr/bin/inkscape"' \ - 'INKSCAPE="${inkscape_0}/bin/inkscape"' \ + 'INKSCAPE="${inkscape}/bin/inkscape"' \ --replace 'OPTIPNG="/usr/bin/optipng"' \ 'OPTIPNG="${optipng}/bin/optipng"' done |