uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
121
pkgs/applications/audio/cantata/default.nix
Normal file
121
pkgs/applications/audio/cantata/default.nix
Normal file
|
|
@ -0,0 +1,121 @@
|
|||
{ mkDerivation
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, qtbase
|
||||
, qtsvg
|
||||
, qttools
|
||||
, perl
|
||||
|
||||
# Cantata doesn't build with cdparanoia enabled so we disable that
|
||||
# default for now until I (or someone else) figure it out.
|
||||
, withCdda ? false
|
||||
, cdparanoia
|
||||
, withCddb ? false
|
||||
, libcddb
|
||||
, withLame ? false
|
||||
, lame
|
||||
, withMusicbrainz ? false
|
||||
, libmusicbrainz5
|
||||
|
||||
, withTaglib ? true
|
||||
, taglib
|
||||
, taglib_extras
|
||||
, withHttpStream ? true
|
||||
, qtmultimedia
|
||||
, withReplaygain ? true
|
||||
, ffmpeg
|
||||
, speex
|
||||
, mpg123
|
||||
, withMtp ? true
|
||||
, libmtp
|
||||
, withOnlineServices ? true
|
||||
, withDevices ? true
|
||||
, udisks2
|
||||
, withDynamic ? true
|
||||
, withHttpServer ? true
|
||||
, withLibVlc ? false
|
||||
, libvlc
|
||||
, withStreams ? true
|
||||
}:
|
||||
|
||||
# Inter-dependencies.
|
||||
assert withCddb -> withCdda && withTaglib;
|
||||
assert withCdda -> withCddb && withMusicbrainz;
|
||||
assert withLame -> withCdda && withTaglib;
|
||||
assert withMtp -> withTaglib;
|
||||
assert withMusicbrainz -> withCdda && withTaglib;
|
||||
assert withOnlineServices -> withTaglib;
|
||||
assert withReplaygain -> withTaglib;
|
||||
assert withLibVlc -> withHttpStream;
|
||||
|
||||
let
|
||||
fstat = x: fn:
|
||||
"-DENABLE_${fn}=${if x then "ON" else "OFF"}";
|
||||
|
||||
withUdisks = (withTaglib && withDevices);
|
||||
|
||||
options = [
|
||||
{ names = [ "CDDB" ]; enable = withCddb; pkgs = [ libcddb ]; }
|
||||
{ names = [ "CDPARANOIA" ]; enable = withCdda; pkgs = [ cdparanoia ]; }
|
||||
{ names = [ "DEVICES_SUPPORT" ]; enable = withDevices; pkgs = [ ]; }
|
||||
{ names = [ "DYNAMIC" ]; enable = withDynamic; pkgs = [ ]; }
|
||||
{ names = [ "FFMPEG" "MPG123" "SPEEXDSP" ]; enable = withReplaygain; pkgs = [ ffmpeg speex mpg123 ]; }
|
||||
{ names = [ "HTTPS_SUPPORT" ]; enable = true; pkgs = [ ]; }
|
||||
{ names = [ "HTTP_SERVER" ]; enable = withHttpServer; pkgs = [ ]; }
|
||||
{ names = [ "HTTP_STREAM_PLAYBACK" ]; enable = withHttpStream; pkgs = [ qtmultimedia ]; }
|
||||
{ names = [ "LAME" ]; enable = withLame; pkgs = [ lame ]; }
|
||||
{ names = [ "LIBVLC" ]; enable = withLibVlc; pkgs = [ libvlc ]; }
|
||||
{ names = [ "MTP" ]; enable = withMtp; pkgs = [ libmtp ]; }
|
||||
{ names = [ "MUSICBRAINZ" ]; enable = withMusicbrainz; pkgs = [ libmusicbrainz5 ]; }
|
||||
{ names = [ "ONLINE_SERVICES" ]; enable = withOnlineServices; pkgs = [ ]; }
|
||||
{ names = [ "STREAMS" ]; enable = withStreams; pkgs = [ ]; }
|
||||
{ names = [ "TAGLIB" "TAGLIB_EXTRAS" ]; enable = withTaglib; pkgs = [ taglib taglib_extras ]; }
|
||||
{ names = [ "UDISKS2" ]; enable = withUdisks; pkgs = [ udisks2 ]; }
|
||||
];
|
||||
|
||||
in
|
||||
mkDerivation rec {
|
||||
pname = "cantata";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CDrummond";
|
||||
repo = "cantata";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UaZEKZvCA50WsdQSSJQQ11KTK6rM4ouCHDX7pn3NlQw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Cantata wants to check if perl is in the PATH at runtime, but we
|
||||
# patchShebangs the playlists scripts, making that unnecessary (perl will
|
||||
# always be available because it's a dependency)
|
||||
./dont-check-for-perl-in-PATH.diff
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs playlists
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtsvg
|
||||
(perl.withPackages (ppkgs: with ppkgs; [ URI ]))
|
||||
]
|
||||
++ lib.flatten (builtins.catAttrs "pkgs" (builtins.filter (e: e.enable) options));
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config qttools ];
|
||||
|
||||
cmakeFlags = lib.flatten (map (e: map (f: fstat e.enable f) e.names) options);
|
||||
|
||||
meta = with lib; {
|
||||
description = "A graphical client for MPD";
|
||||
homepage = "https://github.com/cdrummond/cantata";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
# Technically, Cantata should run on Darwin/Windows so if someone wants to
|
||||
# bother figuring that one out, be my guest.
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
diff --git a/playlists/dynamicplaylists.cpp b/playlists/dynamicplaylists.cpp
|
||||
index 07b6dce3..6a3f97c9 100644
|
||||
--- a/playlists/dynamicplaylists.cpp
|
||||
+++ b/playlists/dynamicplaylists.cpp
|
||||
@@ -211,11 +211,6 @@ void DynamicPlaylists::start(const QString &name)
|
||||
return;
|
||||
}
|
||||
|
||||
- if (Utils::findExe("perl").isEmpty()) {
|
||||
- emit error(tr("You need to install \"perl\" on your system in order for Cantata's dynamic mode to function."));
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
QString fName(Utils::dataDir(rulesDir, false)+name+constExtension);
|
||||
|
||||
if (!QFile::exists(fName)) {
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue