Merge pull request #143726 from zhaofengli/phosh-0.14.0

This commit is contained in:
Sandro 2021-11-22 16:27:48 +01:00 committed by GitHub
commit 9ad4e86627
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 4 deletions

View file

@ -32,11 +32,24 @@ let
url = "https://github.com/swaywm/wlroots/commit/e18599b05e0f0cbeba11adbd489e801285470eab.patch";
sha256 = "17ax4dyk0584yhs3lq8ija5bkainjf7psx9c9r50cr4jm9c0i37l";
})
# xwayland: Allow to retrieve _NET_STARTUP_ID
(fetchpatch {
name = "allow-to-retrieve-net-startup-id.patch";
url = "https://github.com/swaywm/wlroots/commit/66593071bc90a1cccaeedc636eb6f33c973f5362.patch";
sha256 = "sha256-yKf/twdUzrII5IakH7AH6LGyPDo9Nl/gIB0pTThSTfY=";
})
# xwayland: Allow to retrieve startup-id via _NET_STARTUP_INFO
(fetchpatch {
name = "allow-to-retrieve-startup-id-via-net-startup-info.patch";
url = "https://github.com/swaywm/wlroots/commit/235bb6f2fcb8ee4174215ba74b5bc2f191c5960a.patch";
sha256 = "sha256-7AWBq12tF/781CmgvTaOvTIiiJMywxRn6eWp+jacdak=";
})
];
});
in stdenv.mkDerivation rec {
pname = "phoc";
version = "0.8.0";
version = "0.9.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
@ -44,7 +57,7 @@ in stdenv.mkDerivation rec {
owner = "Phosh";
repo = pname;
rev = "v${version}";
sha256 = "sha256-QAnJlpFjWJvwxGyenmN4IaI9VFn2jwdXpa8VqAmH7Xw=";
sha256 = "sha256-qd1ZETM2/AjU5nKQIqh0Q+SboLNr+NncvSHgLv2S3KI=";
};
nativeBuildInputs = [

View file

@ -30,7 +30,7 @@
stdenv.mkDerivation rec {
pname = "phosh";
version = "0.13.1";
version = "0.14.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
repo = pname;
rev = "v${version}";
fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects
sha256 = "sha256-dKQK4mGe/dvNlca/XMDeq1Q4dH/WBF/rtiUh8RssF5c=";
sha256 = "sha256-pN2IWJDsQoTSOUki5gKhIucFYlYchzrqKHQYq6o4EkI=";
};
nativeBuildInputs = [