diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-09-08 21:24:14 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-09-09 05:54:43 +0300 |
| commit | 1f2a18d9163f75c1001a04157f195557b0c24f8a (patch) | |
| tree | af5e9c92e375151ac241cca80e035d726f28f1ef /pkgs/applications/audio/clementine | |
| parent | 4bdcb220c9c9d965d37d3e18c5dcb10ef2605d22 (diff) | |
protobuf: remove old versions
This leaves only protobuf3_1 which is the last version with libprotobuf2. Also fix several packages to build with the latest protobuf.
Diffstat (limited to 'pkgs/applications/audio/clementine')
| -rw-r--r-- | pkgs/applications/audio/clementine/default.nix | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index d916b8957e62c..affddd90784cf 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -54,19 +54,23 @@ let ++ stdenv.lib.optionals (withCD) [libcdio] ++ stdenv.lib.optionals (withCloud) [sparsehash]; + postPatch = '' + sed -i src/CMakeLists.txt \ + -e 's,-Werror,,g' \ + -e 's,-Wno-unknown-warning-option,,g' \ + -e 's,-Wno-unused-private-field,,g' + sed -i CMakeLists.txt \ + -e 's,libprotobuf.a,protobuf,g' + ''; + free = stdenv.mkDerivation { name = "clementine-free-${version}"; - inherit src patches nativeBuildInputs buildInputs; + inherit src patches nativeBuildInputs buildInputs postPatch; cmakeFlags = [ "-DUSE_SYSTEM_PROJECTM=ON" ]; enableParallelBuilding = true; - postPatch = '' - sed -i src/CMakeLists.txt \ - -e 's,-Werror,,g' \ - -e 's,-Wno-unknown-warning-option,,g' \ - -e 's,-Wno-unused-private-field,,g' - ''; + meta = with stdenv.lib; { homepage = http://www.clementine-player.org; description = "A multiplatform music player"; @@ -80,7 +84,7 @@ let blob = stdenv.mkDerivation { name = "clementine-blob-${version}"; # Use the same patches and sources as Clementine - inherit src nativeBuildInputs; + inherit src nativeBuildInputs postPatch; patches = [ ./clementine-spotify-blob.patch |