diff options
author | Silvan Mosberger <infinisil@icloud.com> | 2018-07-25 00:03:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-25 00:03:22 +0200 |
commit | e56b97fcf1d63cf428112c5392274af49ab781f2 (patch) | |
tree | 1e3710e92038ca2647882316bdfd9a1c301c728b /pkgs | |
parent | 56dd84bef75c0916da489f1dec860f6290dd579f (diff) | |
parent | 91622a24aa6235cd3b83d77adddc2ff231714c7a (diff) | |
download | nixpkgs-e56b97fcf1d63cf428112c5392274af49ab781f2.tar nixpkgs-e56b97fcf1d63cf428112c5392274af49ab781f2.tar.gz nixpkgs-e56b97fcf1d63cf428112c5392274af49ab781f2.tar.bz2 nixpkgs-e56b97fcf1d63cf428112c5392274af49ab781f2.tar.lz nixpkgs-e56b97fcf1d63cf428112c5392274af49ab781f2.tar.xz nixpkgs-e56b97fcf1d63cf428112c5392274af49ab781f2.tar.zst nixpkgs-e56b97fcf1d63cf428112c5392274af49ab781f2.zip |
Merge pull request #43641 from jfrankenau/ffmpeg-libmysofa
libmysofa: init at 0.6 and enable in ffmpeg-full
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/audio/libmysofa/default.nix | 26 | ||||
-rw-r--r-- | pkgs/development/libraries/ffmpeg-full/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 31 insertions, 1 deletions
diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix new file mode 100644 index 00000000000..d802d70adf3 --- /dev/null +++ b/pkgs/development/libraries/audio/libmysofa/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, cmake, zlib }: + +stdenv.mkDerivation rec { + name = "libmysofa-${version}"; + version = "0.6"; + + src = fetchFromGitHub { + owner = "hoene"; + repo = "libmysofa"; + rev = "v${version}"; + sha256 = "160gcmsn6dwaca29bs95nsgjdalwc299lip0h37k3jcbxxkchgsh"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib ]; + + cmakeFlags = [ "-DBUILD_TESTS=OFF" ]; + + meta = with stdenv.lib; { + description = "Reader for AES SOFA files to get better HRTFs"; + homepage = https://github.com/hoene/libmysofa; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ jfrankenau ]; + }; +} diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 34c649022cf..e8e177de06a 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -77,6 +77,7 @@ #, libiec61883 ? null, libavc1394 ? null # iec61883 (also uses libraw1394) #, libmfx ? null # Hardware acceleration vis libmfx , libmodplug ? null # ModPlug support +, libmysofa ? null # HRTF support via SOFAlizer #, libnut ? null # NUT (de)muxer, native (de)muser exists , libogg ? null # Ogg container used by vorbis & theora , libopus ? null # Opus de/encoder @@ -344,6 +345,7 @@ stdenv.mkDerivation rec { #(enableFeature (if isLinux then libiec61883 != null && libavc1394 != null && libraw1394 != null else false) "libiec61883") #(enableFeature (libmfx != null) "libmfx") (enableFeature (libmodplug != null) "libmodplug") + (enableFeature (libmysofa != null) "libmysofa") #(enableFeature (libnut != null) "libnut") (enableFeature (libopus != null) "libopus") (enableFeature (libssh != null) "libssh") @@ -405,7 +407,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 celt fontconfig freetype frei0r fribidi game-music-emu gnutls gsm - libjack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug + libjack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11 libxcb libXv lzma openal openjpeg libpulseaudio rtmpdump opencore-amr samba SDL2 soxr speex vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45af6cd5931..ed28a756360 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10342,6 +10342,8 @@ with pkgs; libmypaint = callPackage ../development/libraries/libmypaint { }; + libmysofa = callPackage ../development/libraries/audio/libmysofa { }; + libmysqlconnectorcpp = callPackage ../development/libraries/libmysqlconnectorcpp { mysql = mysql57; }; |