From f8fceac2de6fa57e8ae5fbff827f84511941cc7d Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 25 Jul 2024 11:41:21 -0400 Subject: [PATCH] phosh: 0.39.0 -> 0.41.0 --- pkgs/applications/window-managers/phosh/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 32ece77e4fb0..4c4f0bb54455 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -32,16 +32,17 @@ , libsecret , evolution-data-server , nixosTests +, gmobile }: stdenv.mkDerivation (finalAttrs: { pname = "phosh"; - version = "0.39.0"; + version = "0.41.0"; src = fetchurl { # Release tarball which includes subprojects gvc and libcall-ui url = with finalAttrs; "https://sources.phosh.mobi/releases/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-n1ZegSJAUr1Lbn0+Mx64vHhl4bwSJEdnO1xN/QdEKlw="; + hash = "sha256-HXuD9YC7gqGqAq2YmhXI3WRGsvyBc6PgSW3YSYTOdI4="; }; nativeBuildInputs = [ @@ -67,6 +68,8 @@ stdenv.mkDerivation (finalAttrs: { gcr networkmanager polkit + gmobile + gnome.gnome-bluetooth gnome.gnome-control-center gnome-desktop gnome.gnome-session @@ -87,11 +90,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = false; mesonFlags = [ - "-Dsystemd=true" "-Dcompositor=${phoc}/bin/phoc" - # https://github.com/NixOS/nixpkgs/issues/36468 - # https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/1363 - "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" # Save some time building if tests are disabled "-Dtests=${lib.boolToString finalAttrs.finalPackage.doCheck}" ];