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

Cosmetics

Browse Source
This commit is contained in:
Philipp Hausmann 2017-03-16 20:50:10 +01:00
parent 45d8d6ebeb
commit 0bd6fdcfc4
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nixos/modules/services/audio/slimserver.nix
View File

@ -21,9 +21,9 @@ in {
package = mkOption { package = mkOption {
type = types.package; type = types.package;
default = pkgs.slimserver; default = pkgs.slimserver;
defaultText = "pkgs.slimserver"; defaultText = "pkgs.slimserver";
description = "Slimserver package to use."; description = "Slimserver package to use.";
}; };
dataDir = mkOption { dataDir = mkOption {
@ -84,9 +84,9 @@ in {
groups.slimserver.gid = config.ids.gids.slimserver; groups.slimserver.gid = config.ids.gids.slimserver;
users.slimserver = { users.slimserver = {
uid = config.ids.uids.slimserver; uid = config.ids.uids.slimserver;
description = "Slimserver daemon user"; description = "Slimserver daemon user";
home = cfg.dataDir; home = cfg.dataDir;
group = "slimserver"; group = "slimserver";
}; };
}; };
}; };

2
pkgs/servers/slimserver/default.nix
View File

@ -1,5 +1,4 @@
{ stdenv, buildPerlPackage, fetchurl { stdenv, buildPerlPackage, fetchurl
#, sqlite, expat, mp4v2, flac, spidermonkey_1_8_5, taglib, libexif, curl, ffmpeg, file
, perl, perlPackages }: , perl, perlPackages }:
buildPerlPackage rec { buildPerlPackage rec {
@ -62,6 +61,7 @@ buildPerlPackage rec {
prePatch = '' prePatch = ''
mkdir CPAN_used mkdir CPAN_used
# slimserver doesn't work with current DBIx/SQL versions, use bundled copies
mv CPAN/DBIx CPAN/SQL CPAN_used mv CPAN/DBIx CPAN/SQL CPAN_used
rm -rf CPAN rm -rf CPAN
rm -rf Bin rm -rf Bin