diff options
| author | adisbladis <adisbladis@gmail.com> | 2018-07-03 00:01:18 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-03 00:01:18 +0800 |
| commit | c5fd7d85cef2f4144d87c8831890c3ef3753d78d (patch) | |
| tree | a27bd78bfe5b3e3cfa96c230836246c12c1d49b9 /pkgs/applications/misc | |
| parent | 033c9ace4ee1bae291d9fd793613795a2ff034cb (diff) | |
| parent | 5aa51e54a973f6635c6824ec2c585ffb4eecc382 (diff) | |
| download | nixpkgs-c5fd7d85cef2f4144d87c8831890c3ef3753d78d.tar nixpkgs-c5fd7d85cef2f4144d87c8831890c3ef3753d78d.tar.gz nixpkgs-c5fd7d85cef2f4144d87c8831890c3ef3753d78d.tar.bz2 nixpkgs-c5fd7d85cef2f4144d87c8831890c3ef3753d78d.tar.lz nixpkgs-c5fd7d85cef2f4144d87c8831890c3ef3753d78d.tar.xz nixpkgs-c5fd7d85cef2f4144d87c8831890c3ef3753d78d.tar.zst nixpkgs-c5fd7d85cef2f4144d87c8831890c3ef3753d78d.zip | |
Merge pull request #42842 from Pneumaticat/barrier-fix-qt-5.11
barrier: fix compilation on Qt 5.11
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/barrier/default.nix | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix index 0bc12e269c0..6151b3d55ab 100644 --- a/pkgs/applications/misc/barrier/default.nix +++ b/pkgs/applications/misc/barrier/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, curl, xorg, avahi, qt5, +{ stdenv, fetchpatch, fetchurl, cmake, curl, xorg, avahi, qt5, avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; } }: @@ -13,9 +13,18 @@ stdenv.mkDerivation rec { buildInputs = [ cmake curl xorg.libX11 xorg.libXext xorg.libXtst avahiWithLibdnssdCompat ]; propagatedBuildInputs = with qt5; [ qtbase ]; + patches = [ + # Fix compilation on Qt 5.11 + # Patch should be removed on next version bump from 2.1.1! + (fetchpatch { + url = "https://github.com/debauchee/barrier/commit/a956cad0da23f544b874888c6c3540dc7f8f22cf.patch"; + sha256 = "0x5045bdks1f9casp0v7svx9ml1gxhkhw5sqc7xk36h184m24a21"; + }) + ]; + postFixup = '' - substituteInPlace "$out/share/applications/barrier.desktop" --replace "Exec=barrier" "Exec=$out/bin/barrier" - ''; + substituteInPlace "$out/share/applications/barrier.desktop" --replace "Exec=barrier" "Exec=$out/bin/barrier" + ''; meta = { description = "Open-source KVM software"; |