summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--maintainers/maintainer-list.nix5
-rw-r--r--pkgs/applications/misc/barrier/default.nix33
-rw-r--r--pkgs/top-level/all-packages.nix2
3 files changed, 40 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 50185280c5a5..4f28823f0c24 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2973,6 +2973,11 @@
github = "phreedom";
name = "Evgeny Egorochkin";
};
+ phryneas = {
+ email = "mail@lenzw.de";
+ github = "phryneas";
+ name = "Lenz Weber";
+ };
phunehehe = {
email = "phunehehe@gmail.com";
github = "phunehehe";
diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix
new file mode 100644
index 000000000000..0bc12e269c0e
--- /dev/null
+++ b/pkgs/applications/misc/barrier/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, cmake, curl, xorg, avahi, qt5,
+ 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";
+ };
+
+ buildInputs = [ cmake curl xorg.libX11 xorg.libXext xorg.libXtst avahiWithLibdnssdCompat ];
+ propagatedBuildInputs = with qt5; [ qtbase ];
+
+ postFixup = ''
+ substituteInPlace "$out/share/applications/barrier.desktop" --replace "Exec=barrier" "Exec=$out/bin/barrier"
+ '';
+
+ meta = {
+ description = "Open-source KVM software";
+ longDescription = ''
+ Barrier is KVM software forked from Symless's synergy 1.9 codebase.
+ Synergy was a commercialized reimplementation of the original
+ CosmoSynergy written by Chris Schoeneman.
+ '';
+ homepage = https://github.com/debauchee/barrier;
+ downloadPage = https://github.com/debauchee/barrier/releases;
+ license = stdenv.lib.licenses.gpl2;
+ maintainers = [ stdenv.lib.maintainers.phryneas ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 10eb430e9fa5..63c943a86e2f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14950,6 +14950,8 @@ with pkgs;
ffmpeg = ffmpeg_1;
};
+ barrier = callPackage ../applications/misc/barrier {};
+
banshee = callPackage ../applications/audio/banshee {
gconf = pkgs.gnome2.GConf;
libgpod = pkgs.libgpod.override { monoSupport = true; };