From 88aee703c24c8a9234a71ad973dc65abfc093af6 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 19 Mar 2022 16:28:50 +0800 Subject: [PATCH 1/5] various: remove elementary-icon-theme from buildInputs These apps don't hardcode their icon themes and the icon theme is no longer picked up by wrapGAppsHook by default. User may also able to choose to use icon themes of their choice so pulling them to XDG_DATA_DIRS is mostly no use. --- pkgs/applications/audio/vocal/default.nix | 1 - pkgs/applications/misc/regextester/default.nix | 1 - pkgs/applications/office/bookworm/default.nix | 1 - pkgs/applications/office/spice-up/default.nix | 1 - pkgs/applications/science/math/nasc/default.nix | 1 - pkgs/tools/misc/hashit/default.nix | 1 - pkgs/tools/text/snippetpixie/default.nix | 1 - 7 files changed, 7 deletions(-) diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix index 3d6f3aef9e1b..2860ae570f78 100644 --- a/pkgs/applications/audio/vocal/default.nix +++ b/pkgs/applications/audio/vocal/default.nix @@ -56,7 +56,6 @@ stdenv.mkDerivation rec { libgee libnotify libunity - pantheon.elementary-icon-theme pantheon.granite sqlite webkitgtk diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/applications/misc/regextester/default.nix index b7eb2367528d..2a00cb92b9d1 100644 --- a/pkgs/applications/misc/regextester/default.nix +++ b/pkgs/applications/misc/regextester/default.nix @@ -37,7 +37,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - pantheon.elementary-icon-theme pantheon.granite glib libgee diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix index 8bd1d8f974b3..100818ad249d 100644 --- a/pkgs/applications/office/bookworm/default.nix +++ b/pkgs/applications/office/bookworm/default.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - pantheon.elementary-icon-theme pantheon.granite glib libgee diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix index 1de5a8b817b4..9c716dfd9a43 100644 --- a/pkgs/applications/office/spice-up/default.nix +++ b/pkgs/applications/office/spice-up/default.nix @@ -46,7 +46,6 @@ stdenv.mkDerivation rec { libgee libgudev libsoup - pantheon.elementary-icon-theme pantheon.granite ]; diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index 2fe027365cdc..3e7a8b56af1c 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -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. diff --git a/pkgs/tools/misc/hashit/default.nix b/pkgs/tools/misc/hashit/default.nix index b9bf5f0ae5f8..5971939da174 100644 --- a/pkgs/tools/misc/hashit/default.nix +++ b/pkgs/tools/misc/hashit/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 libgee - pantheon.elementary-icon-theme pantheon.granite ]; diff --git a/pkgs/tools/text/snippetpixie/default.nix b/pkgs/tools/text/snippetpixie/default.nix index 7102977e8eee..ad323a575b9f 100644 --- a/pkgs/tools/text/snippetpixie/default.nix +++ b/pkgs/tools/text/snippetpixie/default.nix @@ -57,7 +57,6 @@ stdenv.mkDerivation rec { xorg.libXtst pantheon.granite pantheon.elementary-gtk-theme - pantheon.elementary-icon-theme ]; doCheck = true; From 2e80b3ffabe31df07b80fded68fcea7f4be60bb5 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 19 Mar 2022 16:31:43 +0800 Subject: [PATCH 2/5] snippetpixie: remove elementary-gtk-theme from buildInputs Adding the theme to buildInputs does not ensure it to present in XDG_DATA_DIRS. The app does not hardcode GTK theme so if user has some GTK theme installed this won't work anyway. --- pkgs/tools/text/snippetpixie/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/text/snippetpixie/default.nix b/pkgs/tools/text/snippetpixie/default.nix index ad323a575b9f..a83135b5024d 100644 --- a/pkgs/tools/text/snippetpixie/default.nix +++ b/pkgs/tools/text/snippetpixie/default.nix @@ -56,7 +56,6 @@ stdenv.mkDerivation rec { json-glib xorg.libXtst pantheon.granite - pantheon.elementary-gtk-theme ]; doCheck = true; From 8523b08ea654262fd994ec543e9940dd182b0b11 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 19 Mar 2022 16:42:17 +0800 Subject: [PATCH 3/5] vocal: fix build with vala 0.56 --- pkgs/applications/audio/vocal/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix index 2860ae570f78..0c80dda703e7 100644 --- a/pkgs/applications/audio/vocal/default.nix +++ b/pkgs/applications/audio/vocal/default.nix @@ -72,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; From 0180c45910c9f2215d1e11cca5975bcde5bc3f3b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 19 Mar 2022 16:48:16 +0800 Subject: [PATCH 4/5] appeditor: fix build with vala 0.56 --- pkgs/applications/misc/appeditor/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/misc/appeditor/default.nix b/pkgs/applications/misc/appeditor/default.nix index cf1303422d27..9e38a208e179 100644 --- a/pkgs/applications/misc/appeditor/default.nix +++ b/pkgs/applications/misc/appeditor/default.nix @@ -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 ''; From 32daca577ff8fb90dee238b3ff3073852413d55b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 19 Mar 2022 17:05:21 +0800 Subject: [PATCH 5/5] tootle: fix build with vala 0.56 --- pkgs/applications/misc/tootle/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index f29c471d04b0..c11ad8d1e981 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -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 '';