diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2020-07-20 08:45:05 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-20 08:45:05 +0000 |
commit | 23c93a5205fd98ac9cdb8eabbbd2c2c9bc9a324e (patch) | |
tree | c6918251d1a149ff6c3c0ebd400968b4cc5c7458 /pkgs/data | |
parent | a8546a078df91b2fa3a37395698a7224e35408bb (diff) | |
parent | 8402a74cce2216de0fd2cce4e5fd897e5dedd450 (diff) |
Merge pull request #85169 from prusnak/inkscape
inkscape: 0.92.5 -> 1.0
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/fonts/emojione/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/fonts/twemoji-color-font/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/icons/bibata-cursors/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/icons/bibata-cursors/extra.nix | 4 | ||||
-rw-r--r-- | pkgs/data/icons/bibata-cursors/translucent.nix | 4 | ||||
-rw-r--r-- | pkgs/data/icons/capitaine-cursors/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/icons/numix-cursor-theme/default.nix | 4 | ||||
-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 |
13 files changed, 30 insertions, 30 deletions
diff --git a/pkgs/data/fonts/emojione/default.nix b/pkgs/data/fonts/emojione/default.nix index 6f5168e90d5e2..71bd2216da2d6 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 a9bf3720c071d..ed04aa78ae169 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 66ed71f1f9ecb..670746d5d1a69 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 7977566cb613a..c353a049f078f 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 90e1102e124ce..4b215d071ab52 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 09491b904ef11..73ae4fe915ff6 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 d0411a8c5697d..6445628e9bb2c 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 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 ''; |