From 9529a0dae2e2ebc8120ad74458bfcaf7eadaf3a8 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 17 May 2015 15:12:14 -0500 Subject: [PATCH] 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. --- pkgs/applications/audio/clementine/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index cc13868e9d4..5ebe1b3b7b8 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -46,8 +46,8 @@ let usbmuxd ]; - unwrapped = stdenv.mkDerivation { - name = "clementine-unwrapped-${version}"; + free = stdenv.mkDerivation { + name = "clementine-free-${version}"; inherit patches src buildInputs; enableParallelBuilding = true; meta = with stdenv.lib; { @@ -91,7 +91,7 @@ with stdenv.lib; runCommand "clementine-${version}" { - inherit blob unwrapped; + inherit blob free; buildInputs = [ makeWrapper ] ++ gst_plugins; # for the setup-hooks dontPatchELF = true; dontStrip = true; @@ -109,7 +109,7 @@ runCommand "clementine-${version}" } '' mkdir -p $out/bin - makeWrapper "$unwrapped/bin/${exeName}" "$out/bin/${exeName}" \ + makeWrapper "$free/bin/${exeName}" "$out/bin/${exeName}" \ ${optionalString withSpotify "--set CLEMENTINE_SPOTIFYBLOB \"$blob/libexec/clementine\""} \ --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d700ff5bfe..cb0322b7b66 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1014,6 +1014,8 @@ let gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_ugly gst_ffmpeg ]; }; + clementineFree = clementine.free; + ciopfs = callPackage ../tools/filesystems/ciopfs { }; cmst = callPackage ../tools/networking/cmst { };