diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/window-managers/phosh/default.nix')
-rw-r--r-- | nixpkgs/pkgs/applications/window-managers/phosh/default.nix | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/nixpkgs/pkgs/applications/window-managers/phosh/default.nix b/nixpkgs/pkgs/applications/window-managers/phosh/default.nix index 9fa0959ed505..0a16bfc8842b 100644 --- a/nixpkgs/pkgs/applications/window-managers/phosh/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/phosh/default.nix @@ -8,6 +8,8 @@ , wrapGAppsHook , libhandy , libxkbcommon +, libgudev +, callaudiod , pulseaudio , glib , gtk3 @@ -24,27 +26,20 @@ , networkmanager , polkit , libsecret -, writeText }: -let - gvc = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = "libgnome-volume-control"; - rev = "ae1a34aafce7026b8c0f65a43c9192d756fe1057"; - sha256 = "0a4qh5pgyjki904qf7qmvqz2ksxb0p8xhgl2aixfbhixn0pw6saw"; - }; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "phosh"; - version = "0.12.0"; + version = "0.13.1"; src = fetchFromGitLab { - domain = "source.puri.sm"; - owner = "Librem5"; + domain = "gitlab.gnome.org"; + group = "World"; + owner = "Phosh"; repo = pname; rev = "v${version}"; - sha256 = "1s0lgq04qz562iri535wpwvfkmmngdpclyl329cf7rc9ihy1kjvs"; + fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects + sha256 = "sha256-dKQK4mGe/dvNlca/XMDeq1Q4dH/WBF/rtiUh8RssF5c="; }; nativeBuildInputs = [ @@ -60,6 +55,8 @@ in stdenv.mkDerivation rec { libhandy libsecret libxkbcommon + libgudev + callaudiod pulseaudio glib gcr @@ -86,11 +83,6 @@ in stdenv.mkDerivation rec { mesonFlags = [ "-Dsystemd=true" "-Dcompositor=${phoc}/bin/phoc" ]; - postUnpack = '' - rmdir $sourceRoot/subprojects/gvc - ln -s ${gvc} $sourceRoot/subprojects/gvc - ''; - postPatch = '' chmod +x build-aux/post_install.py patchShebangs build-aux/post_install.py @@ -128,9 +120,9 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "A pure Wayland shell prototype for GNOME on mobile devices"; - homepage = "https://source.puri.sm/Librem5/phosh"; + homepage = "https://gitlab.gnome.org/World/Phosh/phosh"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ archseer jtojnar masipcat zhaofengli ]; + maintainers = with maintainers; [ jtojnar masipcat zhaofengli ]; platforms = platforms.linux; }; } |