barrier: 2.1.1 -> 2.3.0

fixes #65292
NixOS · Jul 23, 2019 · 8d6f00a · 8d6f00a
1 parent 5cece63
commit 8d6f00a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 19 deletions.
diff --git 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"

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -17083,7 +17083,7 @@ in
 
   baresip = callPackage ../applications/networking/instant-messengers/baresip { };
 
-  barrier = callPackage ../applications/misc/barrier {};
+  barrier = libsForQt5.callPackage ../applications/misc/barrier {};
 
   bashSnippets = callPackage ../applications/misc/bashSnippets { };