diff options
author | Artturi <Artturin@artturin.com> | 2022-11-21 17:00:23 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-21 17:00:23 +0200 |
commit | e665c8f51e5340a3485696625b5793f2b2ab0329 (patch) | |
tree | ade70b9d487f05675062d359ab644c7bd7c5f03d /pkgs/development | |
parent | b21694b3244294e0d3a79095818426440db0676b (diff) | |
parent | 60ae5afd44c901c83190013af1dbead86e43f268 (diff) |
Merge pull request #202154 from NickCao/xdg-wlr-cross
xdg-desktop-portal-wlr: fix cross compilation
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix b/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix index 5ccd9d6fa49e1..a2dc93845c472 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix @@ -1,11 +1,13 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , makeWrapper , meson , ninja , pkg-config , wayland-protocols +, wayland-scanner , grim , inih , libdrm @@ -28,8 +30,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-UztkfvMIbslPd/d262NZFb6WfESc9nBsSSH96BA4Aqw="; }; - nativeBuildInputs = [ meson ninja pkg-config wayland-protocols makeWrapper ]; - buildInputs = [ inih libdrm mesa pipewire scdoc systemd wayland ]; + # scdoc: mark as build-time dependency + # https://github.com/emersion/xdg-desktop-portal-wlr/pull/248 + patches = [(fetchpatch { + url = "https://github.com/emersion/xdg-desktop-portal-wlr/commit/92ccd62428082ba855e359e83730c4370cd1aac7.patch"; + hash = "sha256-mU1whfp7BoSylaS3y+YwfABImZFOeuItSXCon0C7u20="; + })]; + + strictDeps = true; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner makeWrapper ]; + buildInputs = [ inih libdrm mesa pipewire systemd wayland wayland-protocols ]; mesonFlags = [ "-Dsd-bus-provider=libsystemd" |