diff options
author | sternenseemann <sternenseemann@systemli.org> | 2022-04-26 19:18:46 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-26 19:18:46 +0200 |
commit | 62a7c52db89978cff36650eef16ac4f18fcfee40 (patch) | |
tree | c66d0c2dac52f8325d7d69f5406af121e1403a0c /pkgs/applications/misc | |
parent | 847e6a1f9bb65cb575ada3a005e8e37bb0cbe480 (diff) | |
parent | 725c990db09b4c887b2cce157cfc78ae8d69c64d (diff) |
Merge pull request #170157 from tjni/fix-barrier-gcc-11
barrier: pick up new commit to fix compilation
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/barrier/default.nix | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix index 63a04d1811563..66ad4046d1fbe 100644 --- a/pkgs/applications/misc/barrier/default.nix +++ b/pkgs/applications/misc/barrier/default.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, cmake, curl, xorg, avahi, qtbase, mkDerivation, openssl, wrapGAppsHook, - avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; } + avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; }, + fetchpatch }: mkDerivation rec { @@ -15,6 +16,16 @@ mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # This patch can be removed when a new version of barrier (greater than 2.4.0) + # is released, which will contain this commit. + (fetchpatch { + name = "add-missing-cstddef-header.patch"; + url = "https://github.com/debauchee/barrier/commit/4b12265ae5d324b942698a3177e1d8b1749414d7.patch"; + sha256 = "sha256-ajMxP7szBFi4h8cMT3qswfa3k/QiJ1FGI3q9fkCFQQk="; + }) + ]; + buildInputs = [ curl xorg.libX11 xorg.libXext xorg.libXtst avahiWithLibdnssdCompat qtbase ]; nativeBuildInputs = [ cmake wrapGAppsHook ]; |