diff options
author | sternenseemann <sternenseemann@systemli.org> | 2024-09-27 11:41:25 +0200 |
---|---|---|
committer | sternenseemann <sternenseemann@systemli.org> | 2024-09-27 11:41:25 +0200 |
commit | b341506a8d18d8d5d47ed4dbb201c8ed04b183d1 (patch) | |
tree | aa477119c53f4d71f3cfceb0f827b92e1c13351b /pkgs/applications/video | |
parent | b6b063bdc265990fb87781682da974578b16443c (diff) | |
parent | fdadb5f0df5d2641c7e4494f4defc31f1e9cb8c0 (diff) |
Merge branch master into haskell-updates
Conflicts from #341407 resolved.
Diffstat (limited to 'pkgs/applications/video')
32 files changed, 76 insertions, 112 deletions
diff --git a/pkgs/applications/video/dmlive/default.nix b/pkgs/applications/video/dmlive/default.nix index db34d1da27497..5127dba204fc4 100644 --- a/pkgs/applications/video/dmlive/default.nix +++ b/pkgs/applications/video/dmlive/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ configd Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ configd Security ]; postInstall = '' wrapProgram "$out/bin/dmlive" --prefix PATH : "${lib.makeBinPath [ mpv ffmpeg nodejs ]}" diff --git a/pkgs/applications/video/glaxnimate/default.nix b/pkgs/applications/video/glaxnimate/default.nix index 9e4eda8a0790a..7c6d8500d8776 100644 --- a/pkgs/applications/video/glaxnimate/default.nix +++ b/pkgs/applications/video/glaxnimate/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { qtWrapperArgs = [ ''--prefix PATH : ${python3WithLibs}/bin'' ]; - passthru.tests.version = lib.optionalAttrs stdenv.isLinux (testers.testVersion { + passthru.tests.version = lib.optionalAttrs stdenv.hostPlatform.isLinux (testers.testVersion { package = glaxnimate; command = "${xvfb-run}/bin/xvfb-run glaxnimate --version"; }); diff --git a/pkgs/applications/video/gnomecast/default.nix b/pkgs/applications/video/gnomecast/default.nix index 37bf7baec8706..bea389ccc5342 100644 --- a/pkgs/applications/video/gnomecast/default.nix +++ b/pkgs/applications/video/gnomecast/default.nix @@ -40,7 +40,7 @@ buildPythonApplication rec { description = "Native Linux GUI for Chromecasting local files"; homepage = "https://github.com/keredson/gnomecast"; license = with licenses; [ gpl3 ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "gnomecast"; }; } diff --git a/pkgs/applications/video/go2tv/default.nix b/pkgs/applications/video/go2tv/default.nix index e48b884e93d32..e7ecf29369354 100644 --- a/pkgs/applications/video/go2tv/default.nix +++ b/pkgs/applications/video/go2tv/default.nix @@ -36,7 +36,7 @@ buildGoModule rec { xorg.libXext xorg.libXxf86vm libglvnd - ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa Kernel UserNotifications ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa Kernel UserNotifications ]; ldflags = [ "-s" diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix index 57da5147407eb..b036e69ce8a39 100644 --- a/pkgs/applications/video/gpac/default.nix +++ b/pkgs/applications/video/gpac/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { # For most other functionality, this should probably be extended nativeBuildInputs = [ pkg-config - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; buildInputs = [ zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon ]; diff --git a/pkgs/applications/video/hyperion-ng/default.nix b/pkgs/applications/video/hyperion-ng/default.nix index 50c00e03c4efd..837e5071f440e 100644 --- a/pkgs/applications/video/hyperion-ng/default.nix +++ b/pkgs/applications/video/hyperion-ng/default.nix @@ -37,12 +37,12 @@ stdenv.mkDerivation rec { qtserialport qtsvg qtx11extras - ] ++ lib.optional stdenv.isLinux libcec + ] ++ lib.optional stdenv.hostPlatform.isLinux libcec ++ lib.optional withRPiDispmanx libraspberrypi; nativeBuildInputs = [ cmake wrapQtAppsHook - ] ++ lib.optional stdenv.isDarwin perl; # for macos bundle + ] ++ lib.optional stdenv.hostPlatform.isDarwin perl; # for macos bundle patchPhase = '' patchShebangs test/testrunner.sh diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix index fef1a9ae80f08..013b6bdf36316 100644 --- a/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/pkgs/applications/video/jellyfin-media-player/default.nix @@ -21,7 +21,7 @@ , qtwebchannel , qtwebengine , qtx11extras -, withDbus ? stdenv.isLinux +, withDbus ? stdenv.hostPlatform.isLinux }: mkDerivation rec { @@ -51,9 +51,9 @@ mkDerivation rec { qtwebchannel qtwebengine qtx11extras - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa CoreAudio CoreFoundation @@ -74,7 +74,7 @@ mkDerivation rec { "-DLINUX_X11POWER=ON" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/bin $out/Applications mv "$out/Jellyfin Media Player.app" $out/Applications diff --git a/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix b/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix index b6aa8009dcd0a..c72568d3805d4 100644 --- a/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix +++ b/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix @@ -22,6 +22,8 @@ in appimageTools.wrapType2 { inherit pname version src; + nativeBuildInputs = [ makeWrapper ]; + profile = '' export LC_ALL=C.UTF-8 ''; @@ -38,7 +40,6 @@ appimageTools.wrapType2 { cp ${extracted}/losslesscut.desktop $out/share/applications substituteInPlace $out/share/applications/losslesscut.desktop \ --replace AppRun losslesscut - source "${makeWrapper}/nix-support/setup-hook" wrapProgram "$out/bin/losslesscut" \ --add-flags "--disable-seccomp-filter-sandbox" ''; diff --git a/pkgs/applications/video/lxdvdrip/default.nix b/pkgs/applications/video/lxdvdrip/default.nix index 6b9c8ef2fd14f..32b533346dfdb 100644 --- a/pkgs/applications/video/lxdvdrip/default.nix +++ b/pkgs/applications/video/lxdvdrip/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ libdvdread ]; meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Command line tool to make a copy from a video DVD for private use"; homepage = "https://sourceforge.net/projects/lxdvdrip"; license = lib.licenses.gpl2; diff --git a/pkgs/applications/video/mirakurun/default.nix b/pkgs/applications/video/mirakurun/default.nix index 3d8034521c89a..a1d9d58403d07 100644 --- a/pkgs/applications/video/mirakurun/default.nix +++ b/pkgs/applications/video/mirakurun/default.nix @@ -41,7 +41,7 @@ buildNpmPackage rec { bash nodejs which - ] ++ lib.optionals stdenv.isLinux [ v4l-utils ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ v4l-utils ]; crc32Patch = substituteAll { src = ./fix-musl-detection.patch; isMusl = if stdenv.hostPlatform.isMusl then "true" else "false"; diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index aff2910784ed7..7d4ced909df61 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -91,8 +91,8 @@ stdenv.mkDerivation rec { zlib ] ++ optionals withGUI [ cmark ] - ++ optionals stdenv.isLinux [ qtwayland ] - ++ optionals stdenv.isDarwin [ libiconv ]; + ++ optionals stdenv.hostPlatform.isLinux [ qtwayland ] + ++ optionals stdenv.hostPlatform.isDarwin [ libiconv ]; # autoupdate is not needed but it silences a ton of pointless warnings postPatch = '' diff --git a/pkgs/applications/video/mlv-app/default.nix b/pkgs/applications/video/mlv-app/default.nix index e3f61cdd82018..da9f4d5807e10 100644 --- a/pkgs/applications/video/mlv-app/default.nix +++ b/pkgs/applications/video/mlv-app/default.nix @@ -18,7 +18,7 @@ mkDerivation rec { sha256 = "sha256-RfZXHmWSjZBxNFwQ/bzHppsLS0LauURIdnkAzxAIBcU="; }; - patches = if stdenv.isAarch64 then ./aarch64-flags.patch else null; + patches = if stdenv.hostPlatform.isAarch64 then ./aarch64-flags.patch else null; installPhase = '' runHook preInstall diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix index c3082639cae7e..5e02d58977ceb 100644 --- a/pkgs/applications/video/motion/default.nix +++ b/pkgs/applications/video/motion/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ puffnfresh veprbl ]; platforms = platforms.unix; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; mainProgram = "motion"; }; } diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix index c9219fdf63596..c3f6981503c8f 100644 --- a/pkgs/applications/video/mpc-qt/default.nix +++ b/pkgs/applications/video/mpc-qt/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { homepage = "https://mpc-qt.github.io"; license = licenses.gpl2; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ romildo ]; mainProgram = "mpc-qt"; }; diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 1608585de795a..352c7b7edae7a 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -5,11 +5,11 @@ , x11Support ? true, libX11, libXext, libGLU, libGL , xineramaSupport ? true, libXinerama , xvSupport ? true, libXv -, alsaSupport ? stdenv.isLinux, alsa-lib +, alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib , screenSaverSupport ? true, libXScrnSaver , vdpauSupport ? false, libvdpau -, cddaSupport ? !stdenv.isDarwin, cdparanoia -, dvdnavSupport ? !stdenv.isDarwin, libdvdnav +, cddaSupport ? !stdenv.hostPlatform.isDarwin, cdparanoia +, dvdnavSupport ? !stdenv.hostPlatform.isDarwin, libdvdnav , dvdreadSupport ? true, libdvdread , bluraySupport ? true, libbluray , amrSupport ? false, amrnb, amrwb @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { ++ lib.optional libjpegSupport libjpeg ++ lib.optional bs2bSupport libbs2b ++ lib.optional v4lSupport libv4l - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.OpenGL ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.OpenGL ] ; configurePlatforms = [ ]; @@ -147,8 +147,8 @@ stdenv.mkDerivation rec { ] ++ lib.optional (useUnfreeCodecs && codecs != null && !crossBuild) "--codecsdir=${codecs}" ++ lib.optional (stdenv.hostPlatform.isx86 && !crossBuild) "--enable-runtime-cpudetection" ++ lib.optional fribidiSupport "--enable-fribidi" - ++ lib.optional (stdenv.isLinux && !stdenv.isAarch64) "--enable-vidix" - ++ lib.optional stdenv.isLinux "--enable-fbdev" + ++ lib.optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch64) "--enable-vidix" + ++ lib.optional stdenv.hostPlatform.isLinux "--enable-fbdev" ++ lib.optionals (crossBuild) [ "--enable-cross-compile" "--disable-vidix-pcidb" diff --git a/pkgs/applications/video/mpv/0001-fix-darwin-build.patch b/pkgs/applications/video/mpv/0001-fix-darwin-build.patch deleted file mode 100644 index c7e486a3c5d14..0000000000000 --- a/pkgs/applications/video/mpv/0001-fix-darwin-build.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/osdep/mac/input_helper.swift -+++ b/osdep/mac/input_helper.swift -@@ -18,6 +18,14 @@ - import Cocoa - import Carbon.HIToolbox - -+extension NSCondition { -+ fileprivate func withLock<T>(_ body: () throws -> T) rethrows -> T { -+ self.lock() -+ defer { self.unlock() } -+ return try body() -+ } -+} -+ - class InputHelper: NSObject { - var option: OptionHelper? - var lock = NSCondition() ---- a/audio/out/ao_avfoundation.m -+++ b/audio/out/ao_avfoundation.m -@@ -312,7 +312,8 @@ - -+ #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 120000 - p->observer = [[AVObserver alloc] initWithAO:ao]; - NSNotificationCenter *center = [NSNotificationCenter defaultCenter]; - [center addObserver:p->observer selector:@selector(handleRestartNotification:) name:AVSampleBufferAudioRendererOutputConfigurationDidChangeNotification object:p->renderer]; - [center addObserver:p->observer selector:@selector(handleRestartNotification:) name:AVSampleBufferAudioRendererWasFlushedAutomaticallyNotification object:p->renderer]; -- -+ #endif - return CONTROL_OK; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 5b255be9a1a58..20601537d3734 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -72,37 +72,37 @@ zimg, # Boolean - alsaSupport ? stdenv.isLinux, + alsaSupport ? stdenv.hostPlatform.isLinux, archiveSupport ? true, bluraySupport ? true, bs2bSupport ? true, cacaSupport ? true, cddaSupport ? false, cmsSupport ? true, - drmSupport ? stdenv.isLinux, - dvbinSupport ? stdenv.isLinux, - dvdnavSupport ? stdenv.isLinux, + drmSupport ? stdenv.hostPlatform.isLinux, + dvbinSupport ? stdenv.hostPlatform.isLinux, + dvdnavSupport ? stdenv.hostPlatform.isLinux, jackaudioSupport ? false, javascriptSupport ? true, libpngSupport ? true, openalSupport ? true, - pipewireSupport ? stdenv.isLinux, - pulseSupport ? config.pulseaudio or stdenv.isLinux, + pipewireSupport ? stdenv.hostPlatform.isLinux, + pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, rubberbandSupport ? true, screenSaverSupport ? true, - sdl2Support ? !stdenv.isDarwin, + sdl2Support ? !stdenv.hostPlatform.isDarwin, sixelSupport ? false, speexSupport ? true, - swiftSupport ? stdenv.isDarwin, + swiftSupport ? stdenv.hostPlatform.isDarwin, theoraSupport ? true, vaapiSupport ? x11Support || waylandSupport, vapoursynthSupport ? false, vdpauSupport ? true, - vulkanSupport ? stdenv.isLinux, - waylandSupport ? stdenv.isLinux, - x11Support ? stdenv.isLinux, - xineramaSupport ? stdenv.isLinux, - xvSupport ? stdenv.isLinux, + vulkanSupport ? stdenv.hostPlatform.isLinux, + waylandSupport ? stdenv.hostPlatform.isLinux, + x11Support ? stdenv.hostPlatform.isLinux, + xineramaSupport ? stdenv.hostPlatform.isLinux, + xvSupport ? stdenv.hostPlatform.isLinux, zimgSupport ? true, }: @@ -124,7 +124,7 @@ let platform // lib.optionalAttrs (platform ? darwinMinVersion) { darwinMinVersion = version; }; stdenv' = - if swiftSupport && stdenv.isDarwin && stdenv.isx86_64 then + if swiftSupport && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then stdenv.override (old: { buildPlatform = overrideSDK old.buildPlatform "11.0"; hostPlatform = overrideSDK old.hostPlatform "11.0"; @@ -135,7 +135,7 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "mpv"; - version = "0.38.0"; + version = "0.39.0"; outputs = [ "out" @@ -148,14 +148,9 @@ stdenv'.mkDerivation (finalAttrs: { owner = "mpv-player"; repo = "mpv"; rev = "v${finalAttrs.version}"; - hash = "sha256-dFajnCpGlNqUv33A8eFEn8kjtzIPkcBY5j0gNVlaiIY="; + hash = "sha256-BOGh+QBTO7hrHohh+RqjSF8eHQH8jVBPjG/k4eyFaaM="; }; - patches = [ - # Fix build with Darwin SDK 11 - ./0001-fix-darwin-build.patch - ]; - postPatch = lib.concatStringsSep "\n" [ # Don't reference compile time dependencies or create a build outputs cycle # between out and dev @@ -194,7 +189,7 @@ stdenv'.mkDerivation (finalAttrs: { (lib.mesonEnable "swift-build" swiftSupport) (lib.mesonEnable "macos-cocoa-cb" swiftSupport) ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Toggle explicitly because it fails on darwin (lib.mesonEnable "videotoolbox-pl" vulkanSupport) ]; @@ -209,7 +204,7 @@ stdenv'.mkDerivation (finalAttrs: { ninja pkg-config ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ buildPackages.darwin.sigtool xcbuild.xcrun ] @@ -283,9 +278,9 @@ stdenv'.mkDerivation (finalAttrs: { ++ lib.optionals xineramaSupport [ libXinerama ] ++ lib.optionals xvSupport [ libXv ] ++ lib.optionals zimgSupport [ zimg ] - ++ lib.optionals stdenv.isLinux [ nv-codec-headers-11 ] - ++ lib.optionals stdenv.isDarwin [ libiconv ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ nv-codec-headers-11 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate CoreFoundation Cocoa @@ -293,12 +288,12 @@ stdenv'.mkDerivation (finalAttrs: { MediaPlayer VideoToolbox ] - ++ lib.optionals (stdenv.isDarwin && swiftSupport) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && swiftSupport) [ AVFoundation CoreMedia ]; - postBuild = lib.optionalString stdenv.isDarwin '' + postBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' pushd .. # Must be run from the source dir because it uses relative paths python3 TOOLS/osxbundle.py -s build/mpv popd @@ -315,22 +310,19 @@ stdenv'.mkDerivation (finalAttrs: { popd pushd $out/share/applications - # patch out smb protocol reference, since our ffmpeg can't handle it - substituteInPlace mpv.desktop --replace-fail "smb," "" - sed -e '/Icon=/ ! s|mpv|umpv|g; s|^Exec=.*|Exec=umpv %U|' \ mpv.desktop > umpv.desktop printf "NoDisplay=true\n" >> umpv.desktop popd '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r mpv.app $out/Applications ''; # Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found. # See the explanation in addDriverRunpath. - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' addDriverRunpath $out/bin/mpv patchShebangs --update --host $out/bin/umpv $out/bin/mpv_identify.sh ''; diff --git a/pkgs/applications/video/mpv/scripts/dynamic-crop.nix b/pkgs/applications/video/mpv/scripts/dynamic-crop.nix index ea39f33ba418b..8f33f5db90663 100644 --- a/pkgs/applications/video/mpv/scripts/dynamic-crop.nix +++ b/pkgs/applications/video/mpv/scripts/dynamic-crop.nix @@ -7,12 +7,12 @@ buildLua { pname = "dynamic-crop"; - version = "0-unstable-2024-06-22"; + version = "0-unstable-2024-09-14"; src = fetchFromGitHub { owner = "Ashyni"; repo = "mpv-scripts"; - rev = "1fadd5ea3e31818db33c9372c40161db6fc1bdd3"; - hash = "sha256-nC0Iw+9PSGxc3OdYhEmFVa49Sw+rIbuFhgZvAphP4cM="; + rev = "d3f5685f5209ae548f8398b21d4dcbbea766d076"; + hash = "sha256-9v8ZsBj9F5Odhfo/iWGA3Ak/+gFrbe0FldrTyCKF6tk="; }; passthru.scriptName = "dynamic-crop.lua"; diff --git a/pkgs/applications/video/mpv/scripts/videoclip.nix b/pkgs/applications/video/mpv/scripts/videoclip.nix index bff265892eb1a..3a2ac5e4e992d 100644 --- a/pkgs/applications/video/mpv/scripts/videoclip.nix +++ b/pkgs/applications/video/mpv/scripts/videoclip.nix @@ -24,7 +24,7 @@ buildLua { substituteInPlace platform.lua \ --replace \'curl\' \'${lib.getExe curl}\' \ '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' --replace xclip ${lib.getExe xclip} \ --replace wl-copy ${lib.getExe' wl-clipboard "wl-copy"} ''; diff --git a/pkgs/applications/video/mpv/wrapper.nix b/pkgs/applications/video/mpv/wrapper.nix index b68f2d50c5c49..8104921aadbdb 100644 --- a/pkgs/applications/video/mpv/wrapper.nix +++ b/pkgs/applications/video/mpv/wrapper.nix @@ -95,7 +95,7 @@ let makeWrapper "${mpv}/bin/mpv" "$out/bin/mpv" ${mostMakeWrapperArgs} rm "$out/bin/umpv" makeWrapper "${mpv}/bin/umpv" "$out/bin/umpv" ${umpvWrapperArgs} - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # wrapProgram can't operate on symlinks rm "$out/Applications/mpv.app/Contents/MacOS/mpv" makeWrapper "${mpv}/Applications/mpv.app/Contents/MacOS/mpv" "$out/Applications/mpv.app/Contents/MacOS/mpv" ${mostMakeWrapperArgs} diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index 5ca88c666ee85..e02aa4af610df 100644 --- a/pkgs/applications/video/natron/default.nix +++ b/pkgs/applications/video/natron/default.nix @@ -98,6 +98,6 @@ stdenv.mkDerivation { license = lib.licenses.gpl2; maintainers = [ maintainers.puffnfresh ]; platforms = platforms.linux; - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 5f3f68fb03f55..c7bcdfc4f75d1 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -31,13 +31,13 @@ , luajit , swig , python3 -, alsaSupport ? stdenv.isLinux +, alsaSupport ? stdenv.hostPlatform.isLinux , alsa-lib -, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux +, pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux , libpulseaudio , libcef , pciutils -, pipewireSupport ? stdenv.isLinux +, pipewireSupport ? stdenv.hostPlatform.isLinux , withFdk ? true , pipewire , libdrm @@ -183,7 +183,7 @@ stdenv.mkDerivation (finalAttrs: { ) ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' addDriverRunpath $out/lib/lib*.so addDriverRunpath $out/lib/obs-plugins/*.so diff --git a/pkgs/applications/video/obs-studio/plugins/input-overlay.nix b/pkgs/applications/video/obs-studio/plugins/input-overlay.nix index 9a2069a27133a..aff145b1fc740 100644 --- a/pkgs/applications/video/obs-studio/plugins/input-overlay.nix +++ b/pkgs/applications/video/obs-studio/plugins/input-overlay.nix @@ -53,6 +53,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.linux; # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix index b66d3d01b234a..f7e21b796c54c 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-RIDsT6eL6bUfqPiyPlecnZHu5OorcJb3Xal8pjdOpAA="; }; - cmakeFlags = lib.optionals stdenv.isi686 [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isi686 [ # We don't want to build the plugin for 32bit. The library integrates with # the 64bit plugin but it's necessary to be loaded into 32bit games. "-DBUILD_PLUGIN=OFF" @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { vulkan-loader wayland ] - ++ lib.optionals (!stdenv.isi686) [ + ++ lib.optionals (!stdenv.hostPlatform.isi686) [ obs-studio ]; diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix index 18ee73b534540..c033c19143683 100644 --- a/pkgs/applications/video/olive-editor/default.nix +++ b/pkgs/applications/video/olive-editor/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation { qtwayland qtmultimedia qttools - ] ++ lib.optional stdenv.isDarwin CoreFoundation; + ] ++ lib.optional stdenv.hostPlatform.isDarwin CoreFoundation; meta = with lib; { description = "Professional open-source NLE video editor"; @@ -90,7 +90,7 @@ stdenv.mkDerivation { maintainers = [ maintainers.balsoft ]; platforms = platforms.unix; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; mainProgram = "olive-editor"; }; } diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index 88f13ef3eb9b3..ec6e309e9b82c 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -10,7 +10,7 @@ , qtsvg , qtwayland , wayland -, waylandSupport ? stdenv.isLinux +, waylandSupport ? stdenv.hostPlatform.isLinux , wrapGAppsHook3 }: @@ -66,7 +66,7 @@ mkDerivationWith python3.pkgs.buildPythonApplication { wrapProgram $out/bin/openshot-qt \ '' # Fix toolbar icons on Darwin - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' --suffix QT_PLUGIN_PATH : "${lib.getBin qtsvg}/${qtbase.qtPluginPrefix}" \ '' + '' "''${gappsWrapperArgs[@]}" \ diff --git a/pkgs/applications/video/pyca/default.nix b/pkgs/applications/video/pyca/default.nix index 52463c4689313..eab7c5a7d2331 100644 --- a/pkgs/applications/video/pyca/default.nix +++ b/pkgs/applications/video/pyca/default.nix @@ -73,7 +73,7 @@ python3.pkgs.buildPythonApplication rec { }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Fully functional Opencast capture agent written in Python"; mainProgram = "pyca"; homepage = "https://github.com/opencast/pyCA"; diff --git a/pkgs/applications/video/qmediathekview/default.nix b/pkgs/applications/video/qmediathekview/default.nix index 0e8f3bfb584bc..d08387669eb3a 100644 --- a/pkgs/applications/video/qmediathekview/default.nix +++ b/pkgs/applications/video/qmediathekview/default.nix @@ -37,7 +37,7 @@ mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ dotlambda ]; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; mainProgram = "QMediathekView"; }; } diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix index 3172c4bb43435..2f0c66ecd1d12 100644 --- a/pkgs/applications/video/qstopmotion/default.nix +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -79,7 +79,7 @@ mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = [ maintainers.leenaars ]; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; platforms = lib.platforms.gnu ++ lib.platforms.linux; mainProgram = "qstopmotion"; }; diff --git a/pkgs/applications/video/sub-batch/default.nix b/pkgs/applications/video/sub-batch/default.nix index 713a0ad2753ea..48b38da01fae5 100644 --- a/pkgs/applications/video/sub-batch/default.nix +++ b/pkgs/applications/video/sub-batch/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/kl/sub-batch"; license = licenses.mit; maintainers = with maintainers; [ erictapen ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "sub-batch"; }; } diff --git a/pkgs/applications/video/vcs/default.nix b/pkgs/applications/video/vcs/default.nix index 105823fec3ab6..91a966bd1f4ea 100644 --- a/pkgs/applications/video/vcs/default.nix +++ b/pkgs/applications/video/vcs/default.nix @@ -5,7 +5,7 @@ }: let version = "1.13.4"; - gopt = if stdenv.isLinux then util-linux else getopt; + gopt = if stdenv.hostPlatform.isLinux then util-linux else getopt; runtimeDeps = [ coreutils ffmpeg gawk gnugrep gnused imagemagick mplayer gopt ]; diff --git a/pkgs/applications/video/youtube-tui/default.nix b/pkgs/applications/video/youtube-tui/default.nix index 89d32f6f9a70f..70458c7f6235c 100644 --- a/pkgs/applications/video/youtube-tui/default.nix +++ b/pkgs/applications/video/youtube-tui/default.nix @@ -43,14 +43,14 @@ rustPlatform.buildRustPackage rec { xorg.libxcb libsixel mpv - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security AppKit ]; # sixel-sys is dynamically linked to libsixel - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' wrapProgram $out/bin/youtube-tui \ --prefix DYLD_LIBRARY_PATH : "${lib.makeLibraryPath [libsixel]}" ''; |