git.iko.soy/typeable/nixpkgs
on master help sign in
barrier: 2.1.1 -> 2.3.0
8d6f00aAria Edmonds
pkgs/applications/misc/barrier/default.nix+11−18
@@ -1,26 +1,19 @@
1−{ stdenv, fetchpatch, fetchurl, cmake, curl, xorg, avahi, qt5,
1+{ stdenv, fetchFromGitHub, cmake, curl, xorg, avahi, qtbase, mkDerivation,
2 avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; }
2 avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; }
3}:
3}:
4
4
5−stdenv.mkDerivation rec {
5+mkDerivation rec {
6− name = "barrier-${version}";
6+ pname = "barrier";
7− version = "2.1.1";
7+ version = "2.3.0";
8− src = fetchurl {
9− url = "https://github.com/debauchee/barrier/archive/v${version}.tar.gz";
10− sha256 = "0x17as5ikfx2r5hawr368a9risvcavyc8zv5g724s709nr6m0pbp";
11− };
12
8
13− buildInputs = [ cmake curl xorg.libX11 xorg.libXext xorg.libXtst avahiWithLibdnssdCompat ];
9+ src = fetchFromGitHub {
14− propagatedBuildInputs = with qt5; [ qtbase ];
10+ owner = "debauchee";
11+ repo = pname;
12+ rev = "v${version}";
13+ sha256 = "1fy7xjwqyisapf8wv50gwpbgbv5b4ldf7766w453h5iw10d18kh0";
14+ };
15
15
16− patches = [
16+ buildInputs = [ cmake curl xorg.libX11 xorg.libXext xorg.libXtst avahiWithLibdnssdCompat qtbase ];
17− # Fix compilation on Qt 5.11
18− # Patch should be removed on next version bump from 2.1.1!
19− (fetchpatch {
20− url = "https://github.com/debauchee/barrier/commit/a956cad0da23f544b874888c6c3540dc7f8f22cf.patch";
21− sha256 = "0x5045bdks1f9casp0v7svx9ml1gxhkhw5sqc7xk36h184m24a21";
22− })
23− ];
24
17
25 postFixup = ''
18 postFixup = ''
26 substituteInPlace "$out/share/applications/barrier.desktop" --replace "Exec=barrier" "Exec=$out/bin/barrier"
19 substituteInPlace "$out/share/applications/barrier.desktop" --replace "Exec=barrier" "Exec=$out/bin/barrier"
pkgs/top-level/all-packages.nix+1−1
@@ -17083,7 +17083,7 @@ in
17083
17083
17084 baresip = callPackage ../applications/networking/instant-messengers/baresip { };
17084 baresip = callPackage ../applications/networking/instant-messengers/baresip { };
17085
17085
17086− barrier = callPackage ../applications/misc/barrier {};
17086+ barrier = libsForQt5.callPackage ../applications/misc/barrier {};
17087
17087
17088 bashSnippets = callPackage ../applications/misc/bashSnippets { };
17088 bashSnippets = callPackage ../applications/misc/bashSnippets { };
17089
17089