summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-12-20 00:06:02 +0100
committerGitHub <noreply@github.com>2021-12-20 00:06:02 +0100
commit2beba9a23a8381eb95187f46b10c3677d8f63ca1 (patch)
treeead06e058f5d5dfe69b4f86a26e2ea3d6cf2debf
parentd2a93c1fc11460cbd30580fd5c0834bd2bf000da (diff)
parent9f9158362e6294ab942d134d31e1c19441bf5e05 (diff)
Merge pull request #151200 from Enzime/add/spotify-tray
-rw-r--r--maintainers/maintainer-list.nix4
-rw-r--r--pkgs/applications/misc/spotify-tray/default.nix25
-rw-r--r--pkgs/applications/networking/syncplay/default.nix2
-rw-r--r--pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix2
-rw-r--r--pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix2
-rw-r--r--pkgs/top-level/all-packages.nix2
6 files changed, 32 insertions, 5 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 532d53558a19..fb9ad4fe3af4 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3481,9 +3481,9 @@
githubId = 5493775;
name = "Ente";
};
- enzime = {
+ Enzime = {
email = "enzime@users.noreply.github.com";
- github = "enzime";
+ github = "Enzime";
githubId = 10492681;
name = "Michael Hoang";
};
diff --git a/pkgs/applications/misc/spotify-tray/default.nix b/pkgs/applications/misc/spotify-tray/default.nix
new file mode 100644
index 000000000000..8b97d9c4851b
--- /dev/null
+++ b/pkgs/applications/misc/spotify-tray/default.nix
@@ -0,0 +1,25 @@
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk3 }:
+
+stdenv.mkDerivation rec {
+ pname = "spotify-tray";
+ version = "1.3.2";
+
+ src = fetchFromGitHub {
+ owner = "tsmetana";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-E86rA8cBjy/bI7sZHlT40o7i23PcONXT5GTHEfcaDf0=";
+ };
+
+ nativeBuildInputs = [ autoreconfHook pkg-config ];
+
+ buildInputs = [ gtk3 ];
+
+ meta = with lib; {
+ homepage = "https://github.com/tsmetana/spotify-tray";
+ description = "Adds a tray icon to the Spotify Linux client application.";
+ license = licenses.gpl3Only;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ Enzime ];
+ };
+}
diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix
index 893a2bc5fb3e..b3c40b0f2fcd 100644
--- a/pkgs/applications/networking/syncplay/default.nix
+++ b/pkgs/applications/networking/syncplay/default.nix
@@ -27,6 +27,6 @@ buildPythonApplication rec {
description = "Free software that synchronises media players";
license = licenses.asl20;
platforms = platforms.linux;
- maintainers = with maintainers; [ enzime ];
+ maintainers = with maintainers; [ Enzime ];
};
}
diff --git a/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix
index a119c31517ce..2cad0ceba55b 100644
--- a/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix
+++ b/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix
@@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
homepage = "http://www.brother.com/";
license = lib.licenses.gpl2;
platforms = [ "x86_64-linux" "i686-linux" ];
- maintainers = [ lib.maintainers.enzime ];
+ maintainers = [ lib.maintainers.Enzime ];
};
}
diff --git a/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix
index 38722a734a66..dc25dbb5a25f 100644
--- a/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix
+++ b/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix
@@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
homepage = "http://www.brother.com/";
license = lib.licenses.unfree;
platforms = [ "x86_64-linux" "i686-linux" ];
- maintainers = [ lib.maintainers.enzime ];
+ maintainers = [ lib.maintainers.Enzime ];
};
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5e9ca3a89163..228dd0da0bf0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28343,6 +28343,8 @@ with pkgs;
spotify-qt = libsForQt5.callPackage ../applications/audio/spotify-qt { };
+ spotify-tray = callPackage ../applications/misc/spotify-tray { };
+
spotify-tui = callPackage ../applications/audio/spotify-tui {
inherit (darwin.apple_sdk.frameworks) AppKit Security;
};