diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-10-06 10:25:58 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-10-06 10:25:58 +0200 |
commit | 692d219a9312fbe3f8b34858a7ca0e32fb72bd07 (patch) | |
tree | 4c0f5e46b2cf639e71acb43990697d769a969d2c /pkgs/applications/video | |
parent | c1a0aa7eb73f86b0224a57671752673befe08953 (diff) | |
parent | 82390e264704e4e1bf1652c9bebdc30a48f7fd07 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r-- | pkgs/applications/video/handbrake/default.nix | 35 | ||||
-rw-r--r-- | pkgs/applications/video/jftui/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/video/obs-studio/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/video/vlc/default.nix | 4 |
4 files changed, 27 insertions, 20 deletions
diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index b56c26dff78d0..1e4b83da8144a 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -1,6 +1,6 @@ -# Upstream distributes HandBrake with bundle of according versions of libraries and patches to them. -# -# Derivation patches HandBrake to use Nix closure dependencies. +# Upstream distributes HandBrake with bundle of according versions of libraries +# and patches to them. This derivation patches HandBrake to use Nix closure +# dependencies. # # NOTE: 2019-07-19: This derivation does not currently support the native macOS # GUI--it produces the "HandbrakeCLI" CLI version only. In the future it would @@ -44,11 +44,6 @@ useFdk ? false, fdk_aac ? null }: -assert stdenv.isDarwin -> AudioToolbox != null - && Foundation != null - && libobjc != null - && VideoToolbox != null; - stdenv.mkDerivation rec { pname = "handbrake"; version = "1.3.3"; @@ -76,15 +71,26 @@ _EOF patchShebangs scripts - substituteInPlace libhb/module.defs \ - --replace /usr/include/libxml2 ${libxml2.dev}/include/libxml2 - # Force using nixpkgs dependencies sed -i '/MODULES += contrib/d' make/include/main.defs sed -e 's/^[[:space:]]*\(meson\|ninja\|nasm\)[[:space:]]*= ToolProbe.*$//g' \ -e '/ ## Additional library and tool checks/,/ ## MinGW specific library and tool checks/d' \ -i make/configure.py - ''; + '' + (lib.optionalString stdenv.isDarwin '' + # Use the Nix-provided libxml2 instead of the patched version available on + # the Handbrake website. + substituteInPlace libhb/module.defs \ + --replace '$(CONTRIB.build/)include/libxml2' ${libxml2.dev}/include/libxml2 + + # Prevent the configure script from failing if xcodebuild isn't available, + # which it isn't in the Nix context. (The actual build goes fine without + # xcodebuild.) + sed -e '/xcodebuild = ToolProbe/s/abort=.\+)/abort=False)/' -i make/configure.py + '') + (lib.optionalString stdenv.isLinux '' + # Use the Nix-provided libxml2 instead of the system-provided one. + substituteInPlace libhb/module.defs \ + --replace /usr/include/libxml2 ${libxml2.dev}/include/libxml2 + ''); nativeBuildInputs = [ pkgconfig autoconf automake libtool m4 python3 @@ -94,8 +100,9 @@ _EOF ffmpeg-full libogg libtheora x264 x265 libvpx dav1d libopus lame libvorbis a52dec speex libsamplerate libiconv fribidi fontconfig freetype libass jansson libxml2 harfbuzz - libdvdread libdvdnav libdvdcss libbluray lzma numactl - ] ++ lib.optionals useGtk [ + libdvdread libdvdnav libdvdcss libbluray lzma + ] ++ lib.optional (!stdenv.isDarwin) numactl + ++ lib.optionals useGtk [ glib gtk3 libappindicator-gtk3 libnotify gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev libgudev hicolor-icon-theme diff --git a/pkgs/applications/video/jftui/default.nix b/pkgs/applications/video/jftui/default.nix index eb572bac4e341..04ed4c16e2bf9 100644 --- a/pkgs/applications/video/jftui/default.nix +++ b/pkgs/applications/video/jftui/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "jftui"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "Aanok"; repo = pname; rev = "v${version}"; - sha256 = "1az737q5i24ylvkx4g3xlq8k48ni91nz5hhbif97g4nlhwl5cqb6"; + sha256 = "0riwqfh5lyjg7as75kyx7jw6zq4gikbglhv8s05y7pzgsc9xy75j"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 5fe10b39a79be..c8d70c72fbacc 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -39,13 +39,13 @@ let in mkDerivation rec { pname = "obs-studio"; - version = "25.0.8"; + version = "26.0.0"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = version; - sha256 = "0j2k65q3wfyfxhvkl6icz4qy0s3kfqhksizy2i3ah7yml266axbj"; + sha256 = "09y57b3c88szl3wyx3cxq8jrm3pfnyg2n25hxl1ynkq3rgaavdq2"; }; nativeBuildInputs = [ addOpenGLRunpath cmake pkgconfig ]; diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 965a5ff32530f..58df85332ea03 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -24,11 +24,11 @@ with stdenv.lib; assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null && wrapQtAppsHook != null); stdenv.mkDerivation rec { - pname = "vlc"; + pname = "${optionalString onlyLibVLC "lib"}vlc"; version = "3.0.11.1"; src = fetchurl { - url = "http://get.videolan.org/vlc/${version}/${pname}-${version}.tar.xz"; + url = "http://get.videolan.org/vlc/${version}/vlc-${version}.tar.xz"; sha256 = "1f46h0hv7fk35zg4iczlp7ib7h2jmh8m4r5klw3g2558ib9134qq"; }; |