From 7706253e5942eb85f4af957b58d31a3efba8efd4 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:21 +0000 Subject: [PATCH] libspotify: move defaults to package file --- pkgs/development/libraries/libspotify/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +--- 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 { };