diff options
| author | Zhaofeng Li <hello@zhaofeng.li> | 2021-08-11 15:54:15 -0700 |
|---|---|---|
| committer | Zhaofeng Li <hello@zhaofeng.li> | 2021-08-31 23:33:24 -0700 |
| commit | 11dc269ec100eedd6658dd5f6faad4908fd4f373 (patch) | |
| tree | 80485666fbe8076cd8aae7b893f6c3b4779271bf /pkgs/applications/window-managers/phosh | |
| parent | 411a5246c0d8e2c1399b4ea6b50413ce81b5fdbd (diff) | |
| download | nixpkgs-11dc269ec100eedd6658dd5f6faad4908fd4f373.tar nixpkgs-11dc269ec100eedd6658dd5f6faad4908fd4f373.tar.gz nixpkgs-11dc269ec100eedd6658dd5f6faad4908fd4f373.tar.bz2 nixpkgs-11dc269ec100eedd6658dd5f6faad4908fd4f373.tar.lz nixpkgs-11dc269ec100eedd6658dd5f6faad4908fd4f373.tar.xz nixpkgs-11dc269ec100eedd6658dd5f6faad4908fd4f373.tar.zst nixpkgs-11dc269ec100eedd6658dd5f6faad4908fd4f373.zip | |
phosh: 0.12.1 -> 0.13.1
Diffstat (limited to 'pkgs/applications/window-managers/phosh')
| -rw-r--r-- | pkgs/applications/window-managers/phosh/default.nix | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 985814a0a13..5a5f1a8e6f7 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/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.1"; + 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 = "048g5sp9jgfiwq6n8my4msm7wy3pdhbg0wxqxvps4m8qf8wa7ffq"; + 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,7 +120,7 @@ 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 ]; platforms = platforms.linux; |