diff options
author | Bobby Rong <rjl931189261@126.com> | 2021-12-21 12:40:03 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-21 12:40:03 +0800 |
commit | b55bd8b208e357079900150d87ab54105ef939df (patch) | |
tree | 70ff335c30b9462966bb8eaeeb3baec7f24d2a95 /pkgs/desktops/pantheon | |
parent | c478eaf416411a7dedf773185b6d5bfc966a80ae (diff) | |
parent | 9d4f3cabe92ad26b391c48dca8495070d0d2d6e4 (diff) | |
download | nixpkgs-b55bd8b208e357079900150d87ab54105ef939df.tar nixpkgs-b55bd8b208e357079900150d87ab54105ef939df.tar.gz nixpkgs-b55bd8b208e357079900150d87ab54105ef939df.tar.bz2 nixpkgs-b55bd8b208e357079900150d87ab54105ef939df.tar.lz nixpkgs-b55bd8b208e357079900150d87ab54105ef939df.tar.xz nixpkgs-b55bd8b208e357079900150d87ab54105ef939df.tar.zst nixpkgs-b55bd8b208e357079900150d87ab54105ef939df.zip |
Merge pull request #151501 from bobby285271/pantheon
pkgs/pantheon: small cleanup
Diffstat (limited to 'pkgs/desktops/pantheon')
5 files changed, 20 insertions, 22 deletions
diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 078dc5d5f04..f83839f6c92 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+=( diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix index 8f4b9fe32b2..764845c0202 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; { diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix index 0e8168d299a..16ed92b45d2 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 diff --git a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix index 97df0f9c78a..d6dc4e66cbc 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; diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 18e00e63bcc..25bce374c23 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 |