public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #38033 from peterhoeg/f/slite

Browse Source 
squeezelite: 2016-05-27 -> 2018-08-14
This commit is contained in:
Ryan Mulligan 2019-02-23 15:10:06 -08:00 committed by GitHub
commit 7776de07f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/misc/ids.nix
View File

@ -272,7 +272,7 @@
nzbget = 245; nzbget = 245;
mosquitto = 246; mosquitto = 246;
toxvpn = 247; toxvpn = 247;
squeezelite = 248; # squeezelite = 248; # DynamicUser = true
turnserver = 249; turnserver = 249;
smokeping = 250; smokeping = 250;
gocd-agent = 251; gocd-agent = 251;

28
nixos/modules/services/audio/squeezelite.nix
View File

@ -3,9 +3,7 @@
with lib; with lib;
let let
dataDir = "/var/lib/squeezelite";
uid = config.ids.uids.squeezelite;
cfg = config.services.squeezelite;
in { in {
@ -17,14 +15,6 @@ in {
enable = mkEnableOption "Squeezelite, a software Squeezebox emulator"; enable = mkEnableOption "Squeezelite, a software Squeezebox emulator";
dataDir = mkOption {
default = "/var/lib/squeezelite";
type = types.str;
description = ''
The directory where Squeezelite stores its name file.
'';
};
extraArguments = mkOption { extraArguments = mkOption {
default = ""; default = "";
type = types.str; type = types.str;
@ -46,22 +36,14 @@ in {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "network.target" "sound.target" ]; after = [ "network.target" "sound.target" ];
description = "Software Squeezebox emulator"; description = "Software Squeezebox emulator";
preStart = "mkdir -p ${cfg.dataDir} && chown -R squeezelite ${cfg.dataDir}";
serviceConfig = { serviceConfig = {
ExecStart = "${pkgs.squeezelite}/bin/squeezelite -N ${cfg.dataDir}/player-name ${cfg.extraArguments}"; DynamicUser = true;
User = "squeezelite"; ExecStart = "${pkgs.squeezelite}/bin/squeezelite -N ${dataDir}/player-name ${cfg.extraArguments}";
PermissionsStartOnly = true; StateDirectory = builtins.baseNameOf dataDir;
SupplementaryGroups = "audio";
}; };
}; };
users.users.squeezelite= {
inherit uid;
group = "nogroup";
extraGroups = [ "audio" ];
description = "Squeezelite user";
home = "${cfg.dataDir}";
};
}; };
} }

16
pkgs/applications/audio/squeezelite/default.nix
View File

@ -1,20 +1,26 @@
{ stdenv, fetchFromGitHub, alsaLib, faad2, flac, libmad, libvorbis, mpg123 }: { stdenv, fetchFromGitHub, alsaLib, faad2, flac, libmad, libvorbis, mpg123 }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "squeezelite-git-2016-05-27"; name = "squeezelite-git-2018-08-14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ralph-irving"; owner = "ralph-irving";
repo = "squeezelite"; repo = "squeezelite";
rev = "e37ed17fed9e11a7346cbe9f1e1deeccc051f42e"; rev = "ecb6e3696a42113994640e5345d0b5ca2e77d28b";
sha256 = "15ihx2dbp4kr6k6r50g9q5npqad5zyv8nqf5cr37bhg964syvbdm"; sha256 = "0di3d5qy8fhawijq6bxy524fgffvzl08dprrws0fs2j1a70fs0fh";
}; };
buildInputs = [ alsaLib faad2 flac libmad libvorbis mpg123 ]; buildInputs = [ alsaLib faad2 flac libmad libvorbis mpg123 ];
enableParallelBuilding = true;
installPhase = '' installPhase = ''
mkdir -p $out/bin runHook preInstall
cp squeezelite $out/bin
install -Dm755 -t $out/bin squeezelite
install -Dm644 -t $out/share/doc/squeezelite *.txt *.md
runHook postInstall
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {