inkscape_0: drop
Inkscape 1.0.1 re-added the old CLI flags: https://gitlab.com/inkscape/inkscape/-/commit/3ca6a4ed08405f2a530a9ed3065f77443f9f7ebe
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
];
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
'';
|
||||
|
||||
|
||||
@@ -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
|
||||
]
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user