From 776dea8d244ae7264bf2775ed4cb2fc1b44b9855 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 31 Dec 2013 07:51:11 -0600 Subject: [PATCH 1/2] add clementine-1.2.1 --- .../clementine-1.2.1-include-paths.patch | 14 ++++++ .../applications/audio/clementine/default.nix | 48 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 64 insertions(+) create mode 100644 pkgs/applications/audio/clementine/clementine-1.2.1-include-paths.patch create mode 100644 pkgs/applications/audio/clementine/default.nix diff --git a/pkgs/applications/audio/clementine/clementine-1.2.1-include-paths.patch b/pkgs/applications/audio/clementine/clementine-1.2.1-include-paths.patch new file mode 100644 index 00000000000..4c17846b99d --- /dev/null +++ b/pkgs/applications/audio/clementine/clementine-1.2.1-include-paths.patch @@ -0,0 +1,14 @@ +diff -ur clementine-1.2.1-a/CMakeLists.txt clementine-1.2.1-b/CMakeLists.txt +--- clementine-1.2.1-a/CMakeLists.txt 2013-11-25 15:16:24.000000000 -0600 ++++ clementine-1.2.1-b/CMakeLists.txt 2013-12-30 17:01:48.470011058 -0600 +@@ -158,6 +158,10 @@ + include_directories(${TAGLIB_INCLUDE_DIRS}) + include_directories(${QJSON_INCLUDE_DIRS}) + include_directories(${GSTREAMER_INCLUDE_DIRS}) ++include_directories(${GSTREAMER_APP_INCLUDE_DIRS}) ++include_directories(${GSTREAMER_BASE_INCLUDE_DIRS}) ++include_directories(${GSTREAMER_CDDA_INCLUDE_DIRS}) ++include_directories(${GSTREAMER_TAG_INCLUDE_DIRS}) + include_directories(${GLIB_INCLUDE_DIRS}) + include_directories(${GLIBCONFIG_INCLUDE_DIRS}) + include_directories(${LIBXML_INCLUDE_DIRS}) diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix new file mode 100644 index 00000000000..cf554f83c8b --- /dev/null +++ b/pkgs/applications/audio/clementine/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, boost, cmake, gettext, gstreamer, gst_plugins_base +, liblastfm, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist +, usbmuxd, libmtp, gvfs, libcdio, protobuf, libspotify, qca2, pkgconfig +, sparsehash }: + +stdenv.mkDerivation { + name = "clementine-1.2.1"; + + src = fetchurl { + url = http://clementine-player.googlecode.com/files/clementine-1.2.1.tar.gz; + sha256 = "0kk5cjmb8nirx0im3c0z91af2k72zxi6lwzm6rb57qihya5nwmfv"; + }; + + patches = [ ./clementine-1.2.1-include-paths.patch ]; + + buildInputs = [ + boost + cmake + fftw + gettext + glew + gst_plugins_base + gstreamer + gvfs + libcdio + libgpod + liblastfm + libmtp + libplist + libspotify + pkgconfig + protobuf + qca2 + qjson + qt4 + sparsehash + sqlite + taglib + usbmuxd + ]; + + meta = with stdenv.lib; { + homepage = "http://www.clementine-player.org"; + description = "A multiplatform music player"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 758d8e41efb..e8cac3b34e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -664,6 +664,8 @@ let cksfv = callPackage ../tools/networking/cksfv { }; + clementine = callPackage ../applications/audio/clementine { }; + ciopfs = callPackage ../tools/filesystems/ciopfs { }; colord = callPackage ../tools/misc/colord { }; From ef108a8d319cfcc0c1b0478c142e677a6159f437 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 1 Jan 2014 13:11:11 -0600 Subject: [PATCH 2/2] add sparsehash-2.0.2 --- .../libraries/sparsehash/default.nix | 17 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/libraries/sparsehash/default.nix diff --git a/pkgs/development/libraries/sparsehash/default.nix b/pkgs/development/libraries/sparsehash/default.nix new file mode 100644 index 00000000000..1f9bbcbd18d --- /dev/null +++ b/pkgs/development/libraries/sparsehash/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "sparsehash-2.0.2"; + + src = fetchurl { + url = http://sparsehash.googlecode.com/files/sparsehash-2.0.2.tar.gz; + sha256 = "0z5qa1sbp6xx5qpdvrdjh185k5kj53sgb6h2qabw01sn2nkkkmif"; + }; + + meta = with stdenv.lib; { + homepage = "http://code.google.com/p/sparsehash/"; + description = "An extremely memory-efficient hash_map implementation"; + platforms = platforms.all; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8cac3b34e6..1e7a9ed7581 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1830,6 +1830,8 @@ let inherit (pkgsi686Linux.xlibs) libX11; }; + sparsehash = callPackage ../development/libraries/sparsehash { }; + stardict = callPackage ../applications/misc/stardict/stardict.nix { inherit (gnome) libgnomeui scrollkeeper; };