From a410bc3708a6a6042686170a341beb30c25435ff Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 20 Dec 2021 22:15:42 +0800 Subject: pantheon.elementary-greeter: remove elementary-settings-daemon from buildInputs Checked with grep -nr settings-daemon, this is not needed. --- pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 18e00e63bccb..25bce374c23c 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -19,7 +19,6 @@ , elementary-icon-theme , wingpanel-with-indicators , elementary-gtk-theme -, elementary-settings-daemon , nixos-artwork , lightdm , gdk-pixbuf @@ -33,11 +32,9 @@ stdenv.mkDerivation rec { pname = "elementary-greeter"; version = "6.0.1"; - repoName = "greeter"; - src = fetchFromGitHub { owner = "elementary"; - repo = repoName; + repo = "greeter"; rev = version; sha256 = "1f606ds56sp1c58q8dblfpaq9pwwkqw9i4gkwksw45m2xkwlbflq"; }; @@ -67,7 +64,6 @@ stdenv.mkDerivation rec { clutter-gtk # else we get could not generate cargs for mutter-clutter-2 elementary-gtk-theme elementary-icon-theme - elementary-settings-daemon gnome-settings-daemon gdk-pixbuf granite @@ -101,7 +97,7 @@ stdenv.mkDerivation rec { # dbus-launch needed in path --prefix PATH : "${dbus}/bin" - # for `wingpanel -g` + # for `io.elementary.wingpanel -g` --prefix PATH : "${wingpanel-with-indicators}/bin" # for the compositor -- cgit 1.4.1 From d999c2c817a6071aea4e406a94ab533ecdabaa9b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 20 Dec 2021 22:24:46 +0800 Subject: pantheon.elementary-code: drop unneeded LC_ALL Build succeed without this. --- pkgs/desktops/pantheon/apps/elementary-code/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 078dc5d5f047..f83839f6c92c 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -31,11 +31,9 @@ stdenv.mkDerivation rec { pname = "elementary-code"; version = "6.1.0"; - repoName = "code"; - src = fetchFromGitHub { owner = "elementary"; - repo = repoName; + repo = "code"; rev = version; sha256 = "sha256-AXmMcPj2hf33G5v3TUg+eZwaKOdVlRvoVXglMJFHRjw="; }; @@ -75,9 +73,6 @@ stdenv.mkDerivation rec { webkitgtk ]; - # install script fails with UnicodeDecodeError because of printing a fancy elipsis character - LC_ALL = "C.UTF-8"; - # ctags needed in path by outline plugin preFixup = '' gappsWrapperArgs+=( -- cgit 1.4.1 From 2b062ac71fffcf9a6e68c6cd60e31734ae2ab17d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 20 Dec 2021 22:28:48 +0800 Subject: pantheon.switchboard-plug-power: remove elementary-settings-daemon from buildInputs Checked with grep -nr settings-daemon, this is not needed. --- pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix | 2 -- 1 file changed, 2 deletions(-) (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix index 0e8168d299aa..16ed92b45d2d 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix @@ -7,7 +7,6 @@ , pkg-config , vala , libgee -, elementary-settings-daemon , gnome-settings-daemon , granite , gtk3 @@ -44,7 +43,6 @@ stdenv.mkDerivation rec { buildInputs = [ dbus - elementary-settings-daemon gnome-settings-daemon glib granite -- cgit 1.4.1 From a399af5bb2bdf52d1c4d8babe5eacf30d12defaa Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 20 Dec 2021 22:34:26 +0800 Subject: pantheon.switchboard-plug-bluetooth: add wingpanel-indicator-bluetooth to buildInputs See https://github.com/elementary/switchboard-plug-bluetooth/blob/7904ac5764e0adc09fa17850bb59da4d79efc41c/src/Services/Manager.vala#L29 --- pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix index 8f4b9fe32b27..764845c02022 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix @@ -12,6 +12,7 @@ , gtk3 , bluez , switchboard +, wingpanel-indicator-bluetooth }: stdenv.mkDerivation rec { @@ -53,6 +54,7 @@ stdenv.mkDerivation rec { gtk3 libgee switchboard + wingpanel-indicator-bluetooth # settings schema ]; meta = with lib; { -- cgit 1.4.1 From 9d4f3cabe92ad26b391c48dca8495070d0d2d6e4 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 20 Dec 2021 22:52:29 +0800 Subject: pantheon.elementary-redacted-script: use elementary as upstream Make it easier to track updates. --- .../artwork/elementary-redacted-script/default.nix | 23 ++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix index 97df0f9c78ac..d6dc4e66cbcf 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix @@ -1,29 +1,36 @@ { lib , stdenv , fetchFromGitHub +, nix-update-script }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "elementary-redacted-script"; - version = "unstable-2016-06-03"; + version = "5.1.0"; src = fetchFromGitHub { - owner = "png2378"; - repo = "redacted-elementary"; - rev = "346440ff9ce19465e6d5c3d6d67a8573f992c746"; - sha256 = "1jpd13sxkarclr0mlm66wzgpjh52ghzjzn4mywhyshyyskwn7jg1"; + owner = "elementary"; + repo = "fonts"; + rev = version; + sha256 = "sha256-YiE7yaH0ZrF1/Cp+3bcJYm2cExQjFcat6JLMJPjhops="; }; dontBuild = true; installPhase = '' mkdir -p $out/share/fonts/truetype/redacted-elementary - cp -a truetype/*.ttf $out/share/fonts/truetype/redacted-elementary + cp -a redacted/*.ttf $out/share/fonts/truetype/redacted-elementary ''; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Font for concealing text"; - homepage = "https://github.com/png2378/redacted-elementary"; + homepage = "https://github.com/elementary/fonts"; license = licenses.ofl; maintainers = teams.pantheon.members; platforms = platforms.linux; -- cgit 1.4.1