Merge pull request #164837 from bobby285271/pantheon-eco
various: remove elementary-icon-theme from buildInputs & vala 0.56 fixes
This commit is contained in:
commit
b3549ba290
@ -56,7 +56,6 @@ stdenv.mkDerivation rec {
|
||||
libgee
|
||||
libnotify
|
||||
libunity
|
||||
pantheon.elementary-icon-theme
|
||||
pantheon.granite
|
||||
sqlite
|
||||
webkitgtk
|
||||
@ -73,6 +72,13 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Fix build with vala 0.56
|
||||
# https://github.com/needle-and-thread/vocal/pull/503
|
||||
substituteInPlace src/Vocal.vala \
|
||||
--replace "public const OptionEntry[] app_options" "private const OptionEntry[] app_options"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
|
@ -43,6 +43,11 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Fix build with vala 0.56
|
||||
# https://github.com/donadigo/appeditor/pull/122
|
||||
substituteInPlace src/Application.vala \
|
||||
--replace "private static string? create_exec_filename;" "public static string? create_exec_filename;"
|
||||
|
||||
chmod +x meson/post_install.py
|
||||
patchShebangs meson/post_install.py
|
||||
'';
|
||||
|
@ -37,7 +37,6 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
pantheon.elementary-icon-theme
|
||||
pantheon.granite
|
||||
glib
|
||||
libgee
|
||||
|
@ -68,6 +68,11 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Fix build with vala 0.56
|
||||
# https://github.com/bleakgrey/tootle/pull/346
|
||||
substituteInPlace src/Application.vala \
|
||||
--replace "public const GLib.ActionEntry[] app_entries" "private const GLib.ActionEntry[] app_entries"
|
||||
|
||||
chmod +x meson/post_install.py
|
||||
patchShebangs meson/post_install.py
|
||||
'';
|
||||
|
@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
pantheon.elementary-icon-theme
|
||||
pantheon.granite
|
||||
glib
|
||||
libgee
|
||||
|
@ -46,7 +46,6 @@ stdenv.mkDerivation rec {
|
||||
libgee
|
||||
libgudev
|
||||
libsoup
|
||||
pantheon.elementary-icon-theme
|
||||
pantheon.granite
|
||||
];
|
||||
|
||||
|
@ -48,7 +48,6 @@ stdenv.mkDerivation rec {
|
||||
gtk3
|
||||
gtksourceview
|
||||
libgee
|
||||
pantheon.elementary-icon-theme
|
||||
pantheon.granite
|
||||
webkitgtk
|
||||
# We add libqalculate's runtime dependencies because nasc has it as a modified subproject.
|
||||
|
@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
gtk3
|
||||
libgee
|
||||
pantheon.elementary-icon-theme
|
||||
pantheon.granite
|
||||
];
|
||||
|
||||
|
@ -56,8 +56,6 @@ stdenv.mkDerivation rec {
|
||||
json-glib
|
||||
xorg.libXtst
|
||||
pantheon.granite
|
||||
pantheon.elementary-gtk-theme
|
||||
pantheon.elementary-icon-theme
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
Loading…
Reference in New Issue
Block a user