Merge pull request #219355 from tomfitzhenry/phosh-0.25.1

phosh: 0.23 -> 0.25.1
This commit is contained in:
Mario Rodas 2023-03-10 21:03:33 -05:00 committed by GitHub
commit 2ce9b9842b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 10 deletions

View file

@ -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";

View file

@ -52,7 +52,7 @@ let
});
in stdenv.mkDerivation rec {
pname = "phoc";
version = "0.21.1";
version = "0.25.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
@ -60,7 +60,8 @@ in stdenv.mkDerivation rec {
owner = "Phosh";
repo = pname;
rev = "v${version}";
sha256 = "sha256-HPqhro6TE/Ukh4txBPrDoIuDaxSxd/ZkDVZU3+m3GFg=";
sha256 = "sha256-1cbv4vzQ+RcRoT1pOT8Q0nxuZzKUlec38KCNMYaceeE=";
fetchSubmodules = true;
};
nativeBuildInputs = [

View file

@ -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