From 2455dfab0da8bb2158d9c404ec13ccf42250ed3e Mon Sep 17 00:00:00 2001 From: Tom Fitzhenry Date: Sat, 4 Mar 2023 00:38:29 +1100 Subject: [PATCH] phosh: 0.23.0 -> 0.25.1 --- nixos/modules/services/x11/desktop-managers/phosh.nix | 2 +- pkgs/applications/window-managers/phosh/default.nix | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/phosh.nix b/nixos/modules/services/x11/desktop-managers/phosh.nix index e889c0e34e7d..3cfa6e044b73 100644 --- a/nixos/modules/services/x11/desktop-managers/phosh.nix +++ b/nixos/modules/services/x11/desktop-managers/phosh.nix @@ -173,7 +173,7 @@ in systemd.services.phosh = { wantedBy = [ "graphical.target" ]; serviceConfig = { - ExecStart = "${cfg.package}/bin/phosh"; + ExecStart = "${cfg.package}/bin/phosh-session"; User = cfg.user; Group = cfg.group; PAMName = "login"; diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 5b4480499d95..95b546a0b1cb 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { pname = "phosh"; - version = "0.23.0"; + version = "0.25.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects - sha256 = "sha256-EMPqBKrtlwI9SJlqZjyAN5CtV4/BNwc5LapfeCEIYxc="; + sha256 = "sha256-ysAZdmkFEuqJDTPe246F2I4Qp+fjtomia42PS8BuMM8="; }; nativeBuildInputs = [ @@ -97,11 +97,6 @@ stdenv.mkDerivation rec { "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" ]; - postPatch = '' - chmod +x build-aux/post_install.py - patchShebangs build-aux/post_install.py - ''; - checkPhase = '' runHook preCheck export NO_AT_BRIDGE=1