diff options
author | Aria Edmonds <aria@ar1as.space> | 2019-07-23 18:36:46 +1000 |
---|---|---|
committer | Aria Edmonds <aria@ar1as.space> | 2019-07-23 19:36:56 +1000 |
commit | 8d6f00a23425c6de8c1c453cdfdace0ee2f859a3 (patch) | |
tree | 624e7ac0041e41404bc823aee842ed44bfb3e115 /pkgs/applications/misc/barrier | |
parent | 5cece63aad54a521189cb52dc3fe976a4e15bf15 (diff) | |
download | nixlib-8d6f00a23425c6de8c1c453cdfdace0ee2f859a3.tar nixlib-8d6f00a23425c6de8c1c453cdfdace0ee2f859a3.tar.gz nixlib-8d6f00a23425c6de8c1c453cdfdace0ee2f859a3.tar.bz2 nixlib-8d6f00a23425c6de8c1c453cdfdace0ee2f859a3.tar.lz nixlib-8d6f00a23425c6de8c1c453cdfdace0ee2f859a3.tar.xz nixlib-8d6f00a23425c6de8c1c453cdfdace0ee2f859a3.tar.zst nixlib-8d6f00a23425c6de8c1c453cdfdace0ee2f859a3.zip |
barrier: 2.1.1 -> 2.3.0
fixes #65292
Diffstat (limited to 'pkgs/applications/misc/barrier')
-rw-r--r-- | pkgs/applications/misc/barrier/default.nix | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix index 6151b3d55ab7..5d3564f38e6a 100644 --- a/pkgs/applications/misc/barrier/default.nix +++ b/pkgs/applications/misc/barrier/default.nix @@ -1,26 +1,19 @@ -{ stdenv, fetchpatch, fetchurl, cmake, curl, xorg, avahi, qt5, +{ stdenv, fetchFromGitHub, cmake, curl, xorg, avahi, qtbase, mkDerivation, avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; } }: -stdenv.mkDerivation rec { - name = "barrier-${version}"; - version = "2.1.1"; - src = fetchurl { - url = "https://github.com/debauchee/barrier/archive/v${version}.tar.gz"; - sha256 = "0x17as5ikfx2r5hawr368a9risvcavyc8zv5g724s709nr6m0pbp"; - }; +mkDerivation rec { + pname = "barrier"; + version = "2.3.0"; - buildInputs = [ cmake curl xorg.libX11 xorg.libXext xorg.libXtst avahiWithLibdnssdCompat ]; - propagatedBuildInputs = with qt5; [ qtbase ]; + src = fetchFromGitHub { + owner = "debauchee"; + repo = pname; + rev = "v${version}"; + sha256 = "1fy7xjwqyisapf8wv50gwpbgbv5b4ldf7766w453h5iw10d18kh0"; + }; - 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"; - }) - ]; + buildInputs = [ cmake curl xorg.libX11 xorg.libXext xorg.libXtst avahiWithLibdnssdCompat qtbase ]; postFixup = '' substituteInPlace "$out/share/applications/barrier.desktop" --replace "Exec=barrier" "Exec=$out/bin/barrier" |