diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-09-24 11:42:32 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-09-24 11:50:58 +0200 |
| commit | 89e983786a4e2cf6dd238af4df6da373cc01e62b (patch) | |
| tree | 857ecb8eab59fe1855b1fb311e6e1e9ec8303bdc /nixos/modules/services/misc | |
| parent | e73b19ae4e984f58cebe4dd4f82cda622da552ab (diff) | |
| download | nixpkgs-89e983786a4e2cf6dd238af4df6da373cc01e62b.tar nixpkgs-89e983786a4e2cf6dd238af4df6da373cc01e62b.tar.gz nixpkgs-89e983786a4e2cf6dd238af4df6da373cc01e62b.tar.bz2 nixpkgs-89e983786a4e2cf6dd238af4df6da373cc01e62b.tar.lz nixpkgs-89e983786a4e2cf6dd238af4df6da373cc01e62b.tar.xz nixpkgs-89e983786a4e2cf6dd238af4df6da373cc01e62b.tar.zst nixpkgs-89e983786a4e2cf6dd238af4df6da373cc01e62b.zip | |
Manual: Remove store path references
Diffstat (limited to 'nixos/modules/services/misc')
| -rw-r--r-- | nixos/modules/services/misc/nixos-manual.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/services/misc/subsonic.nix | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index c570a01fb3b..0c9a916ed21 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -80,7 +80,6 @@ in services.nixosManual.browser = mkOption { type = types.path; - default = "${pkgs.w3m}/bin/w3m"; description = '' Browser used to show the manual. ''; @@ -116,6 +115,8 @@ in services.mingetty.helpLine = mkIf cfg.showManual "\nPress <Alt-F${toString cfg.ttyNumber}> for the NixOS manual."; + services.nixosManual.browser = mkDefault "${pkgs.w3m}/bin/w3m"; + }; } diff --git a/nixos/modules/services/misc/subsonic.nix b/nixos/modules/services/misc/subsonic.nix index 3e1a2e8fbb5..4d164ad8d65 100644 --- a/nixos/modules/services/misc/subsonic.nix +++ b/nixos/modules/services/misc/subsonic.nix @@ -97,7 +97,6 @@ in transcoders = mkOption { type = types.listOf types.path; - default = [ "${pkgs.ffmpeg}/bin/ffmpeg" ]; description = '' List of paths to transcoder executables that should be accessible from Subsonic. Symlinks will be created to each executable inside @@ -153,5 +152,8 @@ in }; users.extraGroups.subsonic.gid = config.ids.gids.subsonic; + + services.subsonic.transcoders = mkDefault [ "${pkgs.ffmpeg}/bin/ffmpeg" ]; + }; } |