about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJan Malakhovski <oxij@oxij.org>2019-02-03 15:30:21 +0000
committerJan Malakhovski <oxij@oxij.org>2019-02-03 15:30:21 +0000
commit7706253e5942eb85f4af957b58d31a3efba8efd4 (patch)
treef1fb8fb38b9eb41c0b86d8b4fa204a80fca83879
parent35a09f9923b3130a5f62a83af6bef17064053099 (diff)
downloadnixlib-7706253e5942eb85f4af957b58d31a3efba8efd4.tar
nixlib-7706253e5942eb85f4af957b58d31a3efba8efd4.tar.gz
nixlib-7706253e5942eb85f4af957b58d31a3efba8efd4.tar.bz2
nixlib-7706253e5942eb85f4af957b58d31a3efba8efd4.tar.lz
nixlib-7706253e5942eb85f4af957b58d31a3efba8efd4.tar.xz
nixlib-7706253e5942eb85f4af957b58d31a3efba8efd4.tar.zst
nixlib-7706253e5942eb85f4af957b58d31a3efba8efd4.zip
libspotify: move defaults to package file
-rw-r--r--pkgs/development/libraries/libspotify/default.nix2
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix
index e472fe014ee7..5bae04a88f94 100644
--- a/pkgs/development/libraries/libspotify/default.nix
+++ b/pkgs/development/libraries/libspotify/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libspotify, alsaLib, readline, pkgconfig, apiKey, unzip, gnused }:
+{ stdenv, fetchurl, libspotify, alsaLib, readline, pkgconfig, apiKey ? null, unzip, gnused }:
 
 let
   version = "12.1.51";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 387cb6fda80b..645a80c6b4bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19395,9 +19395,7 @@ in
     };
   };
 
-  libspotify = callPackage ../development/libraries/libspotify {
-    apiKey = config.libspotify.apiKey or null;
-  };
+  libspotify = callPackage ../development/libraries/libspotify (config.libspotify or {});
 
   sourcetrail = callPackage ../development/tools/sourcetrail { };