Build free part of Clementine on Hydra

Clementine consists of a large free part (the main application) and a
small part with unfree dependencies (the Spotify blob). Add a top-level
attribute for the free Clementine for users who don't want unfree
software, and so that the bulk of Clementine will be in the binary cache.

+6 -4
+4 -4
pkgs/applications/audio/clementine/default.nix
··· 46 usbmuxd 47 ]; 48 49 - unwrapped = stdenv.mkDerivation { 50 - name = "clementine-unwrapped-${version}"; 51 inherit patches src buildInputs; 52 enableParallelBuilding = true; 53 meta = with stdenv.lib; { ··· 91 92 runCommand "clementine-${version}" 93 { 94 - inherit blob unwrapped; 95 buildInputs = [ makeWrapper ] ++ gst_plugins; # for the setup-hooks 96 dontPatchELF = true; 97 dontStrip = true; ··· 109 } 110 '' 111 mkdir -p $out/bin 112 - makeWrapper "$unwrapped/bin/${exeName}" "$out/bin/${exeName}" \ 113 ${optionalString withSpotify "--set CLEMENTINE_SPOTIFYBLOB \"$blob/libexec/clementine\""} \ 114 --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" 115 ''
··· 46 usbmuxd 47 ]; 48 49 + free = stdenv.mkDerivation { 50 + name = "clementine-free-${version}"; 51 inherit patches src buildInputs; 52 enableParallelBuilding = true; 53 meta = with stdenv.lib; { ··· 91 92 runCommand "clementine-${version}" 93 { 94 + inherit blob free; 95 buildInputs = [ makeWrapper ] ++ gst_plugins; # for the setup-hooks 96 dontPatchELF = true; 97 dontStrip = true; ··· 109 } 110 '' 111 mkdir -p $out/bin 112 + makeWrapper "$free/bin/${exeName}" "$out/bin/${exeName}" \ 113 ${optionalString withSpotify "--set CLEMENTINE_SPOTIFYBLOB \"$blob/libexec/clementine\""} \ 114 --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" 115 ''
+2
pkgs/top-level/all-packages.nix
··· 1014 gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_ugly gst_ffmpeg ]; 1015 }; 1016 1017 ciopfs = callPackage ../tools/filesystems/ciopfs { }; 1018 1019 cmst = callPackage ../tools/networking/cmst { };
··· 1014 gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_ugly gst_ffmpeg ]; 1015 }; 1016 1017 + clementineFree = clementine.free; 1018 + 1019 ciopfs = callPackage ../tools/filesystems/ciopfs { }; 1020 1021 cmst = callPackage ../tools/networking/cmst { };