From 431c902d6f6e411782d42c4f44389ccea7150dab Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH 01/15] pantheon.switchboard-plug-applications: fix cross build --- .../pantheon/apps/switchboard-plugs/applications/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix index 2a7f5c78df6f..4456b1480530 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, nix-update-script, + gettext, meson, ninja, pkg-config, @@ -27,6 +28,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + gettext # msgfmt meson ninja pkg-config From f2ac0ae1e42bce5cc31bf18dbc63f5f1c9acd6a9 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH 02/15] pantheon.switchboard-plug-about: fix cross build --- .../pantheon/apps/switchboard-plugs/about/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index be8a879d7288..42df4bea777e 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -12,6 +12,8 @@ libgtop, libgudev, libsoup_3, + gettext, + glib, granite7, gtk4, packagekit, @@ -35,6 +37,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + gettext # msgfmt + glib # glib-compile-resources meson ninja pkg-config From 4d8384aaa8ccd08d8b7b19ee5ff2db6ebc24ba6b Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH 03/15] pantheon.switchboard-plug-datetime: fix cross build --- .../pantheon/apps/switchboard-plugs/datetime/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix index e72aed12a73a..9ecda8e925d6 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix @@ -12,6 +12,7 @@ libgee, libical, granite7, + gettext, gtk4, libxml2, switchboard, @@ -37,6 +38,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ + gettext # msgfmt libxml2 meson ninja From efee565065275122bfae74e1f8aa76537215006d Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH 04/15] pantheon.switchboard-plug-display: fix cross build --- .../pantheon/apps/switchboard-plugs/display/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix index 08b4bb5488b5..8801916abf61 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix @@ -9,6 +9,8 @@ vala, libadwaita, libgee, + gettext, + glib, granite7, gtk4, switchboard, @@ -26,6 +28,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + gettext # msgfmt + glib # glib-compile-resources meson ninja pkg-config From 3a188a28669b26d982043e7bdc280c35cadb5987 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH 05/15] pantheon.switchboard-plug-keyboard: fix cross build --- .../pantheon/apps/switchboard-plugs/keyboard/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index e30a7faf726c..36fc465a300c 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -9,6 +9,7 @@ , vala , libadwaita , libgee +, gettext , gnome-settings-daemon , granite7 , gsettings-desktop-schemas @@ -44,6 +45,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ + gettext # msgfmt libxml2 meson ninja From eeec44920b8feff7b55b6a27982f57caedca15e3 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH 06/15] pantheon.switchboard-plug-notifications: fix cross build --- .../pantheon/apps/switchboard-plugs/notifications/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix index b90f64057557..5e3622f1ed24 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix @@ -9,6 +9,8 @@ vala, libadwaita, libgee, + gettext, + glib, granite7, gtk4, switchboard, @@ -27,6 +29,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + gettext # msgfmt + glib # glib-compile-resources meson ninja pkg-config From 942c3a28740e3d4bfebed925beddb3bfebbffe6f Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH 07/15] pantheon.switchboard-plug-onlineaccounts: fix cross build --- .../pantheon/apps/switchboard-plugs/onlineaccounts/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix index 51074196553b..d2d6136bf8d2 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + glib # glib-compile-resources + gtk4 # gtk-update-icon-cache meson ninja pkg-config From a74d1c5c28c4744a38475260abb2b0c02d1c2d38 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH 08/15] pantheon.switchboard-plug-printers: fix cross build --- .../pantheon/apps/switchboard-plugs/printers/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix index 278cbfbeec12..a3ad381e12cb 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix @@ -9,6 +9,7 @@ vala, libadwaita, libgee, + gettext, granite7, gtk4, cups, @@ -27,6 +28,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + gettext # msgfmt meson ninja pkg-config From 70d3ccf45f87a4c59c5c51f50ac71eade42c5bc2 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH 09/15] pantheon.switchboard-plug-security-privacy: fix cross build --- .../apps/switchboard-plugs/security-privacy/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix index ff4a36666d37..3007862edd71 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -9,6 +9,7 @@ vala, elementary-settings-daemon, libgee, + gettext, granite7, gsettings-desktop-schemas, gala, @@ -31,6 +32,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + gettext # msgfmt meson ninja pkg-config From f9e1bbeb2f97579c65830c50b78768e371de41c7 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH 10/15] pantheon.switchboard-plug-sharing: fix cross build --- .../pantheon/apps/switchboard-plugs/sharing/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix index c0e342dd0088..94503b403df3 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix @@ -9,6 +9,7 @@ vala, elementary-bluetooth-daemon, libgee, + gettext, granite7, gtk4, switchboard, @@ -26,6 +27,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + gettext # msgfmt meson ninja pkg-config From 5bc833a17bf55dd1af197afb288856ddf27af169 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH 11/15] pantheon.switchboard-plug-wacom: fix cross build --- pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix index 9fb0562e02fa..bb96b4a8add9 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix @@ -7,6 +7,7 @@ ninja, pkg-config, vala, + gettext, glib, granite7, gtk4, @@ -30,6 +31,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + gettext # msgfmt meson ninja pkg-config From 48df1c6e7415ce03913ada5daab609a7c5f5b198 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH 12/15] pantheon.switchboard-plug-power: fix strictDeps build --- pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix index 8c89bae1d427..7c9078ad9b6b 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix @@ -9,6 +9,7 @@ vala, libadwaita, libgee, + gettext, gnome-settings-daemon, granite7, gtk4, @@ -31,6 +32,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + gettext # msgfmt meson ninja pkg-config From 2c81ee6df7806dc854370dbd98a49641aa98a5c1 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH 13/15] pantheon.switchboard-plug-bluetooth: fix strictDeps build --- .../pantheon/apps/switchboard-plugs/bluetooth/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix index 3366a34e73af..16b54deeefb5 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix @@ -9,6 +9,7 @@ vala, libadwaita, libgee, + gettext, granite7, gtk4, bluez, @@ -28,6 +29,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + gettext # msgfmt meson ninja pkg-config From 782ce8e3aeeb85259a3acb0cebc0ced33708b562 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH 14/15] pantheon.wingpanel-indicator-power: fix strictDeps build --- .../pantheon/desktop/wingpanel-indicators/power/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index 895615d37426..6140d85064e5 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -10,6 +10,7 @@ ninja, vala, elementary-settings-daemon, + gettext, gtk3, granite, libgtop, @@ -38,6 +39,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ + gettext # msgfmt meson ninja pkg-config From 854921d5896df2fdab647bd31552117292b3de52 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Tue, 14 Jan 2025 20:00:44 +0100 Subject: [PATCH 15/15] patheon.switchboard-plug-mouse-touchpad: fix strictDeps build --- .../pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix index 4f0d896dc290..e36eba828f7f 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -13,6 +13,7 @@ granite7, gtk4, switchboard, + gettext, gnome-settings-daemon, glib, gala, # needed for gestures support @@ -38,6 +39,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ + gettext # msgfmt meson ninja pkg-config