diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 12:16:33 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 12:16:33 +0100 |
| commit | 889351af8b8a9e8bb39dbd09dc56691a28b9d823 (patch) | |
| tree | 0a8ca0a76ed8c8df86b6071f7fc50004a3a26f62 /nixos/modules/services/misc | |
| parent | 69ec09f38aa1f1d37baec73ebdf9cf5f21050f94 (diff) | |
| download | nixpkgs-889351af8b8a9e8bb39dbd09dc56691a28b9d823.tar nixpkgs-889351af8b8a9e8bb39dbd09dc56691a28b9d823.tar.gz nixpkgs-889351af8b8a9e8bb39dbd09dc56691a28b9d823.tar.bz2 nixpkgs-889351af8b8a9e8bb39dbd09dc56691a28b9d823.tar.lz nixpkgs-889351af8b8a9e8bb39dbd09dc56691a28b9d823.tar.xz nixpkgs-889351af8b8a9e8bb39dbd09dc56691a28b9d823.tar.zst nixpkgs-889351af8b8a9e8bb39dbd09dc56691a28b9d823.zip | |
Revert "Merge #12357: nixos docs: show references to packages"
The PR wasn't good enough yet. This reverts commit b2a37ceeea8c38ec71447f8dae1e6890a8cf982d, reversing changes made to 7fa9a1abce623aaf18b22f5dca3fc8a44a494e8d.
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 2aa8f4a06cc..3e1f53e79f3 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-nox}/bin/w3m"; description = '' Browser used to show the manual. ''; @@ -118,6 +117,8 @@ in services.mingetty.helpLine = mkIf cfg.showManual "\nPress <Alt-F${toString cfg.ttyNumber}> for the NixOS manual."; + services.nixosManual.browser = mkDefault "${pkgs.w3m-nox}/bin/w3m"; + }; } diff --git a/nixos/modules/services/misc/subsonic.nix b/nixos/modules/services/misc/subsonic.nix index 020d53a481d..2831e95b948 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" ]; + }; } |