diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2015-05-17 15:12:14 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-05-17 15:41:48 -0500 |
commit | 9529a0dae2e2ebc8120ad74458bfcaf7eadaf3a8 (patch) | |
tree | c7700a52dd78ac8f51347f86373484755329148b /pkgs | |
parent | ec69293f05ac467a8f31cdbd24481610b06ef399 (diff) | |
download | nixlib-9529a0dae2e2ebc8120ad74458bfcaf7eadaf3a8.tar nixlib-9529a0dae2e2ebc8120ad74458bfcaf7eadaf3a8.tar.gz nixlib-9529a0dae2e2ebc8120ad74458bfcaf7eadaf3a8.tar.bz2 nixlib-9529a0dae2e2ebc8120ad74458bfcaf7eadaf3a8.tar.lz nixlib-9529a0dae2e2ebc8120ad74458bfcaf7eadaf3a8.tar.xz nixlib-9529a0dae2e2ebc8120ad74458bfcaf7eadaf3a8.tar.zst nixlib-9529a0dae2e2ebc8120ad74458bfcaf7eadaf3a8.zip |
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.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/audio/clementine/default.nix | 8 | ||||
-rw-r--r-- | 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 cc13868e9d4e..5ebe1b3b7b8b 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 6d700ff5bfe2..cb0322b7b66b 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 { }; |