diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
commit | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (patch) | |
tree | c2630f69080637987b68acb1ee8676d2681fe304 /pkgs/applications/audio/soundkonverter/default.nix | |
parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
parent | e24069138dfec3ef94f211f1da005bb5395adc11 (diff) | |
download | nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.gz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.bz2 nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.lz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.xz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.zst nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.zip |
Merge branch 'nixpkgs-update' into master
Diffstat (limited to 'pkgs/applications/audio/soundkonverter/default.nix')
-rw-r--r-- | pkgs/applications/audio/soundkonverter/default.nix | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/pkgs/applications/audio/soundkonverter/default.nix b/pkgs/applications/audio/soundkonverter/default.nix index df5806b50b9..1c1724fbce8 100644 --- a/pkgs/applications/audio/soundkonverter/default.nix +++ b/pkgs/applications/audio/soundkonverter/default.nix @@ -1,9 +1,9 @@ # currently needs to be installed into an environment and needs a `kbuildsycoca5` run afterwards for plugin discovery { - mkDerivation, fetchFromGitHub, lib, makeWrapper, - cmake, extra-cmake-modules, pkgconfig, + mkDerivation, fetchFromGitHub, fetchpatch, lib, makeWrapper, + cmake, extra-cmake-modules, pkg-config, libkcddb, kconfig, kconfigwidgets, ki18n, kdelibs4support, kio, solid, kwidgetsaddons, kxmlgui, - qtbase, phonon, + qtbase, phonon, taglib, # optional backends withCD ? true, cdparanoia, @@ -43,7 +43,7 @@ let runtimeDeps = [] ++ lib.optionals withMp3 [ lame mp3gain ] ++ lib.optionals withAac [ faad2 aacgain ]; -in +in mkDerivation rec { name = "soundkonverter"; version = "3.0.1"; @@ -53,12 +53,21 @@ mkDerivation rec { rev = "v" + version; sha256 = "1g2khdsjmsi4zzynkq8chd11cbdhjzmi37r9jhpal0b730nq9x7l"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig kdelibs4support makeWrapper ]; + patches = [ + # already merged into master, so it can go during the next release + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/dfaust/soundkonverter/pull/87.patch"; + sha256 = "sha256-XIpD4ZMTZVcu+F27OtpRy51H+uQgpd5l22IZ6XsD64w="; + name = "soundkonverter_taglib.patch"; + stripLen = 1; + }) + ]; + + nativeBuildInputs = [ cmake extra-cmake-modules pkg-config kdelibs4support makeWrapper ]; propagatedBuildInputs = [ libkcddb kconfig kconfigwidgets ki18n kdelibs4support kio solid kwidgetsaddons kxmlgui qtbase phonon]; buildInputs = [ taglib ] ++ runtimeDeps; # encoder plugins go to ${out}/lib so they're found by kbuildsycoca5 - cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=$out" ]; + cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=$out" ]; sourceRoot = "source/src"; # add runt-time deps to PATH postInstall = '' @@ -70,26 +79,26 @@ mkDerivation rec { description = "Audio file converter, CD ripper and Replay Gain tool"; longDescription = '' soundKonverter is a frontend to various audio converters. - + The key features are: - Audio file conversion - Replay Gain calculation - CD ripping - + soundKonverter supports reading and writing tags and covers for many formats, so they are preserved when converting files. - + It is extendable by plugins and supports many backends including: - + - Audio file conversion Backends: faac, faad, ffmpeg, flac, lame, mplayer, neroaac, timidity, fluidsynth, vorbistools, opustools, sox, twolame, flake, mac, shorten, wavpack and speex Formats: ogg vorbis, mp3, flac, wma, aac, ac3, opus, alac, mp2, als, amr nb, amr wb, ape, speex, m4a, mp1, musepack shorten, tta, wavpack, ra, midi, mod, 3gp, rm, avi, mkv, ogv, mpeg, mov, mp4, flv, wmv and rv - + - Replay Gain calculation Backends: aacgain, metaflac, mp3gain, vorbisgain, wvgain, mpcgain Formats: aac, mp3, flac, ogg vorbis, wavpack, musepack - + - CD ripping Backends: cdparanoia ''; |