Merge pull request #133559 from zhaofengli/phosh-0.13.0

authored by

Sandro and committed by
GitHub
5da845a7 538f369f

+17 -24
+4 -3
pkgs/applications/misc/phoc/default.nix
··· 39 version = "0.8.0"; 40 41 src = fetchFromGitLab { 42 - domain = "source.puri.sm"; 43 - owner = "Librem5"; 44 repo = pname; 45 rev = "v${version}"; 46 sha256 = "sha256-QAnJlpFjWJvwxGyenmN4IaI9VFn2jwdXpa8VqAmH7Xw="; ··· 76 77 meta = with lib; { 78 description = "Wayland compositor for mobile phones like the Librem 5"; 79 - homepage = "https://source.puri.sm/Librem5/phoc"; 80 license = licenses.gpl3Plus; 81 maintainers = with maintainers; [ archseer masipcat zhaofengli ]; 82 platforms = platforms.linux;
··· 39 version = "0.8.0"; 40 41 src = fetchFromGitLab { 42 + domain = "gitlab.gnome.org"; 43 + group = "World"; 44 + owner = "Phosh"; 45 repo = pname; 46 rev = "v${version}"; 47 sha256 = "sha256-QAnJlpFjWJvwxGyenmN4IaI9VFn2jwdXpa8VqAmH7Xw="; ··· 77 78 meta = with lib; { 79 description = "Wayland compositor for mobile phones like the Librem 5"; 80 + homepage = "https://gitlab.gnome.org/World/Phosh/phoc"; 81 license = licenses.gpl3Plus; 82 maintainers = with maintainers; [ archseer masipcat zhaofengli ]; 83 platforms = platforms.linux;
+13 -21
pkgs/applications/window-managers/phosh/default.nix
··· 8 , wrapGAppsHook 9 , libhandy 10 , libxkbcommon 11 , pulseaudio 12 , glib 13 , gtk3 ··· 24 , networkmanager 25 , polkit 26 , libsecret 27 - , writeText 28 }: 29 30 - let 31 - gvc = fetchFromGitLab { 32 - domain = "gitlab.gnome.org"; 33 - owner = "GNOME"; 34 - repo = "libgnome-volume-control"; 35 - rev = "ae1a34aafce7026b8c0f65a43c9192d756fe1057"; 36 - sha256 = "0a4qh5pgyjki904qf7qmvqz2ksxb0p8xhgl2aixfbhixn0pw6saw"; 37 - }; 38 - in stdenv.mkDerivation rec { 39 pname = "phosh"; 40 - version = "0.12.1"; 41 42 src = fetchFromGitLab { 43 - domain = "source.puri.sm"; 44 - owner = "Librem5"; 45 repo = pname; 46 rev = "v${version}"; 47 - sha256 = "048g5sp9jgfiwq6n8my4msm7wy3pdhbg0wxqxvps4m8qf8wa7ffq"; 48 }; 49 50 nativeBuildInputs = [ ··· 60 libhandy 61 libsecret 62 libxkbcommon 63 pulseaudio 64 glib 65 gcr ··· 86 87 mesonFlags = [ "-Dsystemd=true" "-Dcompositor=${phoc}/bin/phoc" ]; 88 89 - postUnpack = '' 90 - rmdir $sourceRoot/subprojects/gvc 91 - ln -s ${gvc} $sourceRoot/subprojects/gvc 92 - ''; 93 - 94 postPatch = '' 95 chmod +x build-aux/post_install.py 96 patchShebangs build-aux/post_install.py ··· 128 129 meta = with lib; { 130 description = "A pure Wayland shell prototype for GNOME on mobile devices"; 131 - homepage = "https://source.puri.sm/Librem5/phosh"; 132 license = licenses.gpl3Plus; 133 - maintainers = with maintainers; [ archseer jtojnar masipcat zhaofengli ]; 134 platforms = platforms.linux; 135 }; 136 }
··· 8 , wrapGAppsHook 9 , libhandy 10 , libxkbcommon 11 + , libgudev 12 + , callaudiod 13 , pulseaudio 14 , glib 15 , gtk3 ··· 26 , networkmanager 27 , polkit 28 , libsecret 29 }: 30 31 + stdenv.mkDerivation rec { 32 pname = "phosh"; 33 + version = "0.13.1"; 34 35 src = fetchFromGitLab { 36 + domain = "gitlab.gnome.org"; 37 + group = "World"; 38 + owner = "Phosh"; 39 repo = pname; 40 rev = "v${version}"; 41 + fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects 42 + sha256 = "sha256-dKQK4mGe/dvNlca/XMDeq1Q4dH/WBF/rtiUh8RssF5c="; 43 }; 44 45 nativeBuildInputs = [ ··· 55 libhandy 56 libsecret 57 libxkbcommon 58 + libgudev 59 + callaudiod 60 pulseaudio 61 glib 62 gcr ··· 83 84 mesonFlags = [ "-Dsystemd=true" "-Dcompositor=${phoc}/bin/phoc" ]; 85 86 postPatch = '' 87 chmod +x build-aux/post_install.py 88 patchShebangs build-aux/post_install.py ··· 120 121 meta = with lib; { 122 description = "A pure Wayland shell prototype for GNOME on mobile devices"; 123 + homepage = "https://gitlab.gnome.org/World/Phosh/phosh"; 124 license = licenses.gpl3Plus; 125 + maintainers = with maintainers; [ jtojnar masipcat zhaofengli ]; 126 platforms = platforms.linux; 127 }; 128 }