diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-01 10:06:01 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-01 10:06:01 +0200 |
| commit | ab15a62c68bf7bf3b02e3bab00d121cc1426733c (patch) | |
| tree | 398a82403b04bfa0bae8cadf1c5a64cf83145965 /pkgs/tools/audio | |
| parent | c643ccaa8c91f78b8c89eb87589886b8906d5b38 (diff) | |
| parent | a26357eefe017964448b5bb464163646b927a267 (diff) | |
Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts.
Diffstat (limited to 'pkgs/tools/audio')
| -rw-r--r-- | pkgs/tools/audio/acoustid-fingerprinter/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/audio/liquidsoap/full.nix | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix index f5d4322ec9326..07319fe4c39be 100644 --- a/pkgs/tools/audio/acoustid-fingerprinter/default.nix +++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix @@ -12,9 +12,12 @@ stdenv.mkDerivation rec { buildInputs = [ cmake pkgconfig qt4 taglib chromaprint ffmpeg ]; - meta = { + cmakeFlags = [ "-DTAGLIB_MIN_VERSION=${(builtins.parseDrvName taglib.name).version}" ]; + + meta = with stdenv.lib; { homepage = "http://acoustid.org/fingerprinter"; description = "Audio fingerprinting tool using chromaprint"; license = stdenv.lib.licenses.gpl2Plus; + maintainers = with maintainers; [ ehmry ]; }; } diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index eeebea5d74755..318bb2859e54b 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation { homepage = http://liquidsoap.fm/; maintainers = with maintainers; [ ehmry ]; license = licenses.gpl2; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } |