git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #65293 from ar1a/barrier

barrier: 2.1.1 -> 2.2.0

commitf99063f6a1c2ee14794c3d79d51a7d3a497bee83 authorworldofpeace <worldofpeace@protonmail.ch> dateTue 23 Jul 2019, 05:39 (7 years ago) parentcfd507d8d6f00a
2 files changed+12−19
pkgs/applications/misc/barrier/default.nix+11−18 pkgs/top-level/all-packages.nix+1−1
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,
22 avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; }
33}:
44
5−stdenv.mkDerivation rec {
6− name = "barrier-${version}";
7− version = "2.1.1";
8− src = fetchurl {
9− url = "https://github.com/debauchee/barrier/archive/v${version}.tar.gz";
10− sha256 = "0x17as5ikfx2r5hawr368a9risvcavyc8zv5g724s709nr6m0pbp";
11− };
5+mkDerivation rec {
6+ pname = "barrier";
7+ version = "2.3.0";
128
13− buildInputs = [ cmake curl xorg.libX11 xorg.libXext xorg.libXtst avahiWithLibdnssdCompat ];
14− propagatedBuildInputs = with qt5; [ qtbase ];
9+ src = fetchFromGitHub {
10+ owner = "debauchee";
11+ repo = pname;
12+ rev = "v${version}";
13+ sha256 = "1fy7xjwqyisapf8wv50gwpbgbv5b4ldf7766w453h5iw10d18kh0";
14+ };
1515
16− patches = [
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− ];
16+ buildInputs = [ cmake curl xorg.libX11 xorg.libXext xorg.libXtst avahiWithLibdnssdCompat qtbase ];
2417
2518 postFixup = ''
2619 substituteInPlace "$out/share/applications/barrier.desktop" --replace "Exec=barrier" "Exec=$out/bin/barrier"
pkgs/top-level/all-packages.nix+1−1
@@ -17095,7 +17095,7 @@ in
1709517095
1709617096 baresip = callPackage ../applications/networking/instant-messengers/baresip { };
1709717097
17098− barrier = callPackage ../applications/misc/barrier {};
17098+ barrier = libsForQt5.callPackage ../applications/misc/barrier {};
1709917099
1710017100 bashSnippets = callPackage ../applications/misc/bashSnippets { };
1710117101