diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2023-03-10 21:03:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-10 21:03:33 -0500 |
| commit | 2ce9b9842b5e63884dfc3dea6689769e2a1ea309 (patch) | |
| tree | 1c375e4e5c4ee4be645b83e3ab8cba16a6fc9bb4 | |
| parent | 0a8530182b686e2a76505212ed5b629dfd78130f (diff) | |
| parent | 2455dfab0da8bb2158d9c404ec13ccf42250ed3e (diff) | |
| download | nixpkgs-2ce9b9842b5e63884dfc3dea6689769e2a1ea309.tar nixpkgs-2ce9b9842b5e63884dfc3dea6689769e2a1ea309.tar.gz nixpkgs-2ce9b9842b5e63884dfc3dea6689769e2a1ea309.tar.bz2 nixpkgs-2ce9b9842b5e63884dfc3dea6689769e2a1ea309.tar.lz nixpkgs-2ce9b9842b5e63884dfc3dea6689769e2a1ea309.tar.xz nixpkgs-2ce9b9842b5e63884dfc3dea6689769e2a1ea309.tar.zst nixpkgs-2ce9b9842b5e63884dfc3dea6689769e2a1ea309.zip | |
Merge pull request #219355 from tomfitzhenry/phosh-0.25.1
phosh: 0.23 -> 0.25.1
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/phosh.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/misc/phoc/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/window-managers/phosh/default.nix | 9 |
3 files changed, 6 insertions, 10 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/phosh.nix b/nixos/modules/services/x11/desktop-managers/phosh.nix index e889c0e34e7..3cfa6e044b7 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/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index 79ffb3fdbf9..3fedad7478c 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/applications/misc/phoc/default.nix @@ -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 = [ diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index adb22269f04..a28c471332a 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 |