diff options
author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2015-04-30 16:46:55 +0300 |
---|---|---|
committer | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2015-04-30 16:46:55 +0300 |
commit | 934d3c19fd667cff803c998d76720a36768324f1 (patch) | |
tree | ce30ef2ea36a55545de88f977659dfc72980e204 /pkgs | |
parent | dc5c8ce819313fc4112d0401002f4776cfbb5cc5 (diff) | |
parent | 22faf646f1f71695557f74d8144a5743c484b3c9 (diff) | |
download | nixlib-934d3c19fd667cff803c998d76720a36768324f1.tar nixlib-934d3c19fd667cff803c998d76720a36768324f1.tar.gz nixlib-934d3c19fd667cff803c998d76720a36768324f1.tar.bz2 nixlib-934d3c19fd667cff803c998d76720a36768324f1.tar.lz nixlib-934d3c19fd667cff803c998d76720a36768324f1.tar.xz nixlib-934d3c19fd667cff803c998d76720a36768324f1.tar.zst nixlib-934d3c19fd667cff803c998d76720a36768324f1.zip |
Merge pull request #7640 from jraygauthier/jrg/clementine_improvements
Improvements to the clementine package.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/audio/clementine/default.nix | 112 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 71 insertions, 42 deletions
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 857aa2edaf5e..f3d0eb3f8347 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -1,60 +1,88 @@ { stdenv, fetchurl, boost, cmake, gettext, gstreamer, gst_plugins_base -, gst_plugins_good, gst_plugins_bad, gst_plugins_ugly, gst_ffmpeg , liblastfm, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist , usbmuxd, libmtp, gvfs, libcdio, protobuf, libspotify, qca2, pkgconfig -, sparsehash, config, makeWrapper }: +, sparsehash, config, makeWrapper, gst_plugins }: + +let + version = "1.2.3"; + + withSpotify = config.clementine.spotify or false; + + wrappedExeName = "clementine"; + + wrapped = stdenv.mkDerivation { + name = "clementine-wrapped-${version}"; + + src = fetchurl { + url = https://github.com/clementine-player/Clementine/archive/1.2.3.tar.gz; + sha256 = "1gx1109i4pylz6x7gvp4rdzc6dvh0w6in6hfbygw01d08l26bxbx"; + }; + + patches = [ ./clementine-1.2.1-include-paths.patch ]; + + buildInputs = [ + boost + cmake + fftw + gettext + glew + gst_plugins_base + gstreamer + gvfs + libcdio + libgpod + liblastfm + libmtp + libplist + pkgconfig + protobuf + qca2 + qjson + qt4 + sparsehash + sqlite + taglib + usbmuxd + ]; + + enableParallelBuilding = true; + }; -let withSpotify = config.clementine.spotify or false; in + stdenv.mkDerivation { - name = "clementine-1.2.3"; + name = "clementine-${version}"; - src = fetchurl { - url = https://github.com/clementine-player/Clementine/archive/1.2.3.tar.gz; - sha256 = "1gx1109i4pylz6x7gvp4rdzc6dvh0w6in6hfbygw01d08l26bxbx"; - }; + src = ./.; - patches = [ ./clementine-1.2.1-include-paths.patch ]; buildInputs = [ - boost - cmake - fftw - gettext - glew - gst_plugins_base - gst_plugins_good - gst_plugins_ugly - gst_ffmpeg - gstreamer - gvfs - libcdio - libgpod - liblastfm - libmtp - libplist + wrapped makeWrapper - pkgconfig - protobuf - qca2 - qjson - qt4 - sparsehash - sqlite - taglib - usbmuxd - ] ++ stdenv.lib.optional withSpotify libspotify; - - enableParallelBuilding = true; - - postInstall = '' - wrapProgram $out/bin/clementine \ - --set GST_PLUGIN_SYSTEM_PATH "$GST_PLUGIN_SYSTEM_PATH" + ] ++ gst_plugins + ++ stdenv.lib.optional withSpotify libspotify; + + installPhase = '' + mkdir -p $out + cp -a ${wrapped}/* $out + chmod -R u+w-t $out + + wrapProgram "$out/bin/${wrappedExeName}" \ + --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" ''; + preferLocalBuild = true; + dontPatchELF = true; + dontStrip = true; + meta = with stdenv.lib; { homepage = "http://www.clementine-player.org"; - description = "A multiplatform music player"; + description = "A multiplatform music player" + + " (" + + concatStrings (optionals (withSpotify) ["with spotify, "]) + + "with gstreamer plugins: " + + concatStrings (intersperse ", " (map (x: x.name) gst_plugins)) + + ")"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.ttuegel ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 166847e6b026..ab48e4e367aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -995,6 +995,7 @@ let clementine = callPackage ../applications/audio/clementine { boost = boost156; + gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_ugly gst_ffmpeg ]; }; ciopfs = callPackage ../tools/filesystems/ciopfs { }; |