diff options
| author | Kevin Liu <kevin@potatofrom.space> | 2018-07-01 11:52:28 -0400 |
|---|---|---|
| committer | Kevin Liu <kevin@potatofrom.space> | 2018-07-01 17:12:09 -0400 |
| commit | 5aa51e54a973f6635c6824ec2c585ffb4eecc382 (patch) | |
| tree | 9d38ce120d58a173dbc7287a3b9ab919fa3313bb /pkgs/applications/misc/barrier | |
| parent | 14a9ca27e69e33ac8ffb708de08883f8079f954a (diff) | |
| download | nixlib-5aa51e54a973f6635c6824ec2c585ffb4eecc382.tar nixlib-5aa51e54a973f6635c6824ec2c585ffb4eecc382.tar.gz nixlib-5aa51e54a973f6635c6824ec2c585ffb4eecc382.tar.bz2 nixlib-5aa51e54a973f6635c6824ec2c585ffb4eecc382.tar.lz nixlib-5aa51e54a973f6635c6824ec2c585ffb4eecc382.tar.xz nixlib-5aa51e54a973f6635c6824ec2c585ffb4eecc382.tar.zst nixlib-5aa51e54a973f6635c6824ec2c585ffb4eecc382.zip | |
barrier: fix compilation on Qt 5.11
Diffstat (limited to 'pkgs/applications/misc/barrier')
| -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 0bc12e269c0e..6151b3d55ab7 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"; |