Unverified Commit 69a7cd67 authored by Bobby Rong's avatar Bobby Rong Committed by GitHub
Browse files

Merge pull request #245481 from bobby285271/upd/pantheon 

Pantheon updates 2023-07-26
parents db8672b8 497229d3

nixos/modules/services/x11/desktop-managers/pantheon.nix

+1 −0
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ in 
        gnome.adwaita-icon-theme

        gtk3.out # for gtk-launch program

        onboard

        orca # elementary/greeter#668

        qgnomeplatform

        sound-theme-freedesktop

        xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/

pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -30,13 +30,13 @@ 


stdenv.mkDerivation rec {

  pname = "elementary-greeter";

  version = "6.1.1";

  version = "7.0.0";



  src = fetchFromGitHub {

    owner = "elementary";

    repo = "greeter";

    rev = version;

    sha256 = "sha256-6rjZOX9JOTjZwqWVWTtKjGNy8KgWllE9VQZzwhuBAwE=";

    sha256 = "sha256-m/xuaMCAPoqhl/M547mdafBPBu3UhHmVmBIUKQoS5L8=";

  };



  patches = [

pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -15,13 +15,13 @@ 


stdenv.mkDerivation rec {

  pname = "wingpanel-indicator-a11y";

  version = "1.0.1";

  version = "1.0.2";



  src = fetchFromGitHub {

    owner = "elementary";

    repo = pname;

    rev = version;

    sha256 = "sha256-iS+xTCjbRZfaUiOtHbQ+/SaajfWWAlC9XiZbIGZPO9I=";

    sha256 = "sha256-HECK+IEUAKJ4F1TotTHF84j4BYS6EZdAtLBoM401+mw=";

  };



  nativeBuildInputs = [

pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix

+2 −14
Original line number Diff line number Diff line
@@ -23,13 +23,13 @@ 


stdenv.mkDerivation rec {

  pname = "elementary-settings-daemon";

  version = "1.3.0";

  version = "1.3.1";



  src = fetchFromGitHub {

    owner = "elementary";

    repo = "settings-daemon";

    rev = version;

    sha256 = "sha256-464caR36oSUhxCU0utP5eMYiiBekU6W4bVIbsUoiFRI=";

    sha256 = "sha256-mEmc9uLwUTObsP70P0G2vcRdQF6do/wMTQjvfLUU//o=";

  };



  nativeBuildInputs = [
@@ -58,20 +58,8 @@ stdenv.mkDerivation rec { 
  postPatch = ''

    chmod +x meson/post_install.py

    patchShebangs meson/post_install.py



    substituteInPlace data/io.elementary.settings-daemon.check-for-firmware-updates.service \

      --replace "/usr/bin/busctl" "${systemd}/bin/busctl"

  '';



  postInstall = ''

    # https://github.com/elementary/settings-daemon/pull/75

    mkdir -p $out/etc/xdg/autostart

    ln -s $out/share/applications/io.elementary.settings-daemon.desktop $out/etc/xdg/autostart/io.elementary.settings-daemon.desktop

  '';



  # https://github.com/elementary/settings-daemon/pull/74

  PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system";



  passthru = {

    updateScript = nix-update-script { };

  };