mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 12:59:04 +02:00
phosh: fix build
This commit is contained in:
parent
efb7405702
commit
fa60985d57
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
@ -84,6 +85,19 @@ stdenv.mkDerivation rec {
|
|||
|
||||
mesonFlags = [ "-Dsystemd=true" "-Dcompositor=${phoc}/bin/phoc" ];
|
||||
|
||||
patches = [
|
||||
# build: Adjust to polkit version changes
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/World/Phosh/phosh/-/commit/16b46e295b86cbf1beaccf8218cf65ebb4b7a6f1.patch";
|
||||
sha256 = "sha256-Db1OEdiI1QBHGEBs1Coi7LTF9bCScdDgxmovpBdIY/g=";
|
||||
})
|
||||
# polkit-auth-agent: Scope cleanup function for PolkitAgentListener
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/World/Phosh/phosh/-/commit/b864653df50bfd8f34766fc6b37a3bf32cfbdfa4.patch";
|
||||
sha256 = "sha256-YCw3tGk94NAa6PPTmA1lCJVzzi9GC74BmvtTcvuHPh0=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x build-aux/post_install.py
|
||||
patchShebangs build-aux/post_install.py
|
||||
|
@ -113,7 +127,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
passthru = {
|
||||
providedSessions = [
|
||||
"sm.puri.Phosh"
|
||||
"sm.puri.Phosh"
|
||||
];
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue