about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJan Malakhovski <oxij@oxij.org>2019-02-03 15:30:23 +0000
committerJan Malakhovski <oxij@oxij.org>2019-02-03 15:30:23 +0000
commit25709dfe50ff8322604f995814425131fb0e06b3 (patch)
tree6391ceb52206f0d06de8e0ef2a2dfb892fb9b9f4 /pkgs
parent679bf2a2b205df0f849a8973c592c6bef8dc69fe (diff)
tomahawk: move defaults to package file
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/top-level/all-packages.nix7
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 03dce713e7eaf..0d899a78ac622 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19627,14 +19627,11 @@ in
 
   toggldesktop = libsForQt5.callPackage ../applications/misc/toggldesktop { };
 
-  tomahawk = callPackage ../applications/audio/tomahawk {
+  tomahawk = callPackage ../applications/audio/tomahawk ({
     taglib = taglib_1_9;
-    enableXMPP      = config.tomahawk.enableXMPP      or true;
-    enableKDE       = config.tomahawk.enableKDE       or false;
-    enableTelepathy = config.tomahawk.enableTelepathy or false;
     quazip = quazip_qt4;
     boost = boost155;
-  };
+  } // (config.tomahawk or {}));
 
   topydo = callPackage ../applications/misc/topydo {};