diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3202b8b..473ecb9 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -279,14 +279,6 @@ optional_component(LIBPULSE ON "Pulse audio integration"
 
 optional_component(VISUALISATIONS ON "Visualisations")
 
-if(NOT HAVE_SPOTIFY_BLOB AND NOT CRYPTOPP_FOUND)
-  message(FATAL_ERROR "Either crypto++ must be available or the non-GPL Spotify "
-          "code must be compiled in")
-elseif(CRYPTOPP_FOUND)
-  set(HAVE_CRYPTOPP ON)
-  set(HAVE_SPOTIFY_DOWNLOADER ON)
-endif()
-
 # Find DBus if it's enabled
 if (HAVE_DBUS)
   find_package(Qt5 COMPONENTS DBus)
 value='fbebccf7f6459a7543defbbdb98abd26e9ac56e6'/><select name='h' onchange='this.form.submit();'>
<option value='koszko' selected='selected'>koszko</option>
<option value='koszko-scripts'>koszko-scripts</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=fbebccf7f6459a7543defbbdb98abd26e9ac56e6'>refs</a><a class='active' href='/guix/log/gnu/packages/valgrind.scm'>log</a><a href='/guix/tree/gnu/packages/valgrind.scm?id=fbebccf7f6459a7543defbbdb98abd26e9ac56e6'>tree</a><a href='/guix/commit/gnu/packages/valgrind.scm?id=fbebccf7f6459a7543defbbdb98abd26e9ac56e6'>commit</a><a href='/guix/diff/gnu/packages/valgrind.scm?id=fbebccf7f6459a7543defbbdb98abd26e9ac56e6'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/valgrind.scm'>
<input type='hidden' name='id' value='fbebccf7f6459a7543defbbdb98abd26e9ac56e6'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=fbebccf7f6459a7543defbbdb98abd26e9ac56e6'>root</a>/<a href='/guix/log/gnu?id=fbebccf7f6459a7543defbbdb98abd26e9ac56e6'>gnu</a>/<a href='/guix/log/gnu/packages?id=fbebccf7f6459a7543defbbdb98abd26e9ac56e6'>packages</a>/<a href='/guix/log/gnu/packages/valgrind.scm?id=fbebccf7f6459a7543defbbdb98abd26e9ac56e6'>valgrind.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/valgrind.scm?id=fbebccf7f6459a7543defbbdb98abd26e9ac56e6&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2018-01-19 23:59:20 -0500'>2018-01-19</span></td><td><a href='/guix/commit/gnu/packages/valgrind.scm?id=e074a655dd6497daafbd62737e3b63f3d5aa7985'>Merge branch 'master' into core-updates</a></td><td>Mark H Weaver</td></tr>
<tr><td><span title='2018-01-18 20:57:24 +0100'>2018-01-18</span></td><td><a href='/guix/commit/gnu/packages/valgrind.scm?id=2cdf16c8c27b24ecfa49cc32b8914bdcc6069ed2'>gnu: valgrind: Update to 3.13.0.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/valgrind.scm (valgrind): Update to 3.13.0.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2017-12-07 17:41:51 +0100'>2017-12-07</span></td><td><a href='/guix/commit/gnu/packages/valgrind.scm?id=ff9edc2c82bedc593858f10649c2649f98329818'>gnu: valgrind: Fix test failure with glibc 2.26.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/patches/valgrind-glibc-compat.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/valgrind.scm (valgrind)[source](patches): Use it.
</span></span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2017-08-21 17:04:54 +0200'>2017-08-21</span></td><td><a href='/guix/commit/gnu/packages/valgrind.scm?id=84bf845abc4b25af84a91eef368e1ea2f3d794a5'>gnu: valgrind: Add separate "doc" output.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/valgrind.scm (valgrind)[outputs]: New field.
[arguments]: Add 'install-doc' phase.

Co-authored-by: Ludovic Courtès &lt;ludovic.courtes@inria.fr&gt;
</span></span></td><td>Dave Love</td></tr>