diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 02f57c17c77b..b087115ccf6d 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -23,7 +23,7 @@ xineramaSupport ? true, libxinerama, xvSupport ? true, - libXv, + libxv, alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib, screenSaverSupport ? true, @@ -152,7 +152,7 @@ stdenv.mkDerivation { libGL ] ++ lib.optional alsaSupport alsa-lib - ++ lib.optional xvSupport libXv + ++ lib.optional xvSupport libxv ++ lib.optional theoraSupport libtheora ++ lib.optional cacaSupport libcaca ++ lib.optional xineramaSupport libxinerama diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index 34bdd488251b..eb1b2f232bbd 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -20,7 +20,7 @@ libbluray, lzo, libx11, - libXv, + libxv, libxrandr, libxvmc, libxinerama, @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { libpulseaudio fftwSinglePrec libx11 - libXv + libxv libxrandr libxvmc libxmu diff --git a/pkgs/by-name/ar/ares/package.nix b/pkgs/by-name/ar/ares/package.nix index 15141e58b63e..d4f8f2c97015 100644 --- a/pkgs/by-name/ar/ares/package.nix +++ b/pkgs/by-name/ar/ares/package.nix @@ -9,7 +9,7 @@ libGL, libGLU, libx11, - libXv, + libxv, libao, libpulseaudio, libretro-shaders-slang, @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { libGL libGLU libx11 - libXv + libxv libpulseaudio openal udev diff --git a/pkgs/by-name/av/avidemux/package.nix b/pkgs/by-name/av/avidemux/package.nix index 8257e6696dca..e08c57ac3b85 100644 --- a/pkgs/by-name/av/avidemux/package.nix +++ b/pkgs/by-name/av/avidemux/package.nix @@ -9,7 +9,7 @@ gettext, libvdpau, libva, - libXv, + libxv, sqlite, yasm, freetype, @@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: { gettext libvdpau libva - libXv + libxv sqlite fribidi fontconfig diff --git a/pkgs/by-name/bs/bsnes-hd/package.nix b/pkgs/by-name/bs/bsnes-hd/package.nix index c00a605aa763..f6decae52c64 100644 --- a/pkgs/by-name/bs/bsnes-hd/package.nix +++ b/pkgs/by-name/bs/bsnes-hd/package.nix @@ -6,7 +6,7 @@ gtk3, gtksourceview3, libx11, - libXv, + libxv, libao, libicns, libpulseaudio, @@ -60,7 +60,7 @@ stdenv.mkDerivation { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libx11 - libXv + libxv udev gtk3 gtksourceview3 diff --git a/pkgs/by-name/ci/cinelerra/package.nix b/pkgs/by-name/ci/cinelerra/package.nix index e6139855351a..9f5ac21fb22a 100644 --- a/pkgs/by-name/ci/cinelerra/package.nix +++ b/pkgs/by-name/ci/cinelerra/package.nix @@ -27,7 +27,7 @@ openexr, libxext, libXxf86vm, - libXv, + libxv, libxi, libx11, libxft, @@ -98,7 +98,7 @@ stdenv.mkDerivation { openexr libxext libXxf86vm - libXv + libxv libxi libx11 libxft diff --git a/pkgs/by-name/fr/freerdp/package.nix b/pkgs/by-name/fr/freerdp/package.nix index 97bf400bddf2..67a1f72cbfff 100644 --- a/pkgs/by-name/fr/freerdp/package.nix +++ b/pkgs/by-name/fr/freerdp/package.nix @@ -29,7 +29,7 @@ libxrandr, libxrender, libxtst, - libXv, + libxv, libxkbcommon, libxkbfile, wayland, @@ -127,7 +127,7 @@ stdenv.mkDerivation (finalAttrs: { libxrandr libxrender libxtst - libXv + libxv libjpeg_turbo libkrb5 libopus diff --git a/pkgs/by-name/hi/higan/package.nix b/pkgs/by-name/hi/higan/package.nix index 30910760f250..79523e2ded29 100644 --- a/pkgs/by-name/hi/higan/package.nix +++ b/pkgs/by-name/hi/higan/package.nix @@ -8,7 +8,7 @@ libGL, libGLU, libx11, - libXv, + libxv, libao, libicns, libpulseaudio, @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { libGL libGLU libx11 - libXv + libxv libpulseaudio openal udev diff --git a/pkgs/by-name/in/intel-gpu-tools/package.nix b/pkgs/by-name/in/intel-gpu-tools/package.nix index 839e191b7ed3..404cbdc30ff2 100644 --- a/pkgs/by-name/in/intel-gpu-tools/package.nix +++ b/pkgs/by-name/in/intel-gpu-tools/package.nix @@ -30,7 +30,7 @@ libx11, libxext, libxrandr, - libXv, + libxv, openssl, peg, procps, @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { libx11 libxext libxrandr - libXv + libxv openssl peg procps diff --git a/pkgs/by-name/li/libxvmc/package.nix b/pkgs/by-name/li/libxvmc/package.nix index e651a3e46f4b..d6bbc15c7ab4 100644 --- a/pkgs/by-name/li/libxvmc/package.nix +++ b/pkgs/by-name/li/libxvmc/package.nix @@ -6,7 +6,7 @@ xorgproto, libx11, libxext, - libXv, + libxv, writeScript, testers, }: @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { xorgproto libx11 libxext - libXv + libxv ]; propagatedBuildInputs = [ xorgproto ]; diff --git a/pkgs/by-name/qe/qemacs/package.nix b/pkgs/by-name/qe/qemacs/package.nix index 14b902da6a9f..a9fe44745baa 100644 --- a/pkgs/by-name/qe/qemacs/package.nix +++ b/pkgs/by-name/qe/qemacs/package.nix @@ -8,7 +8,7 @@ enableX11 ? true, libx11, libxext, - libXv, + libxv, libpng, }: @@ -37,7 +37,7 @@ stdenv.mkDerivation { libpng libx11 libxext - libXv + libxv ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/qm/qmplay2/package.nix b/pkgs/by-name/qm/qmplay2/package.nix index b244cca806e8..1799ab01f934 100644 --- a/pkgs/by-name/qm/qmplay2/package.nix +++ b/pkgs/by-name/qm/qmplay2/package.nix @@ -8,7 +8,7 @@ fribidi, game-music-emu, libxdmcp, - libXv, + libxv, libass, libcddb, libcdio, @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { fribidi game-music-emu libxdmcp - libXv + libxv libass libcddb libcdio diff --git a/pkgs/by-name/sn/snes9x/package.nix b/pkgs/by-name/sn/snes9x/package.nix index 57701e16fbd4..316d8a8dc1bd 100644 --- a/pkgs/by-name/sn/snes9x/package.nix +++ b/pkgs/by-name/sn/snes9x/package.nix @@ -11,7 +11,7 @@ libxext, libxinerama, libxrandr, - libXv, + libxv, libepoxy, libpng, libselinux, @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libx11 - libXv + libxv minizip zlib ] diff --git a/pkgs/by-name/vi/virtualglLib/package.nix b/pkgs/by-name/vi/virtualglLib/package.nix index c277e9d7fece..5511583165c3 100644 --- a/pkgs/by-name/vi/virtualglLib/package.nix +++ b/pkgs/by-name/vi/virtualglLib/package.nix @@ -5,7 +5,7 @@ cmake, libGL, libGLU, - libXv, + libxv, libxtst, libxi, libjpeg_turbo, @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { libGL libGLU fltk_1_3 - libXv + libxv libxtst libxi libxcb-keysyms diff --git a/pkgs/by-name/xi/xine-lib/package.nix b/pkgs/by-name/xi/xine-lib/package.nix index 96a26814b0fe..9e3d9d07b6b4 100644 --- a/pkgs/by-name/xi/xine-lib/package.nix +++ b/pkgs/by-name/xi/xine-lib/package.nix @@ -11,7 +11,7 @@ libx11, libxext, libxinerama, - libXv, + libxv, libcaca, libcdio, libmng, @@ -65,8 +65,8 @@ stdenv.mkDerivation (finalAttrs: { libxext libxinerama libxinerama - libXv - libXv + libxv + libxv libcaca libcdio libmng diff --git a/pkgs/by-name/xi/xine-ui/package.nix b/pkgs/by-name/xi/xine-ui/package.nix index 5071a36e4c38..76ebc71b86b8 100644 --- a/pkgs/by-name/xi/xine-ui/package.nix +++ b/pkgs/by-name/xi/xine-ui/package.nix @@ -8,7 +8,7 @@ libxi, libxinerama, libxtst, - libXv, + libxv, libXxf86vm, libjpeg, libpng, @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { libxi libxinerama libxtst - libXv + libxv libXxf86vm libjpeg libpng diff --git a/pkgs/by-name/xj/xjadeo/package.nix b/pkgs/by-name/xj/xjadeo/package.nix index 3b2d790b80a8..828ed719f2ad 100644 --- a/pkgs/by-name/xj/xjadeo/package.nix +++ b/pkgs/by-name/xj/xjadeo/package.nix @@ -9,7 +9,7 @@ libjack2, liblo, libx11, - libXv, + libxv, pkg-config, portmidi, libxpm, @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { freetype libGLU liblo - libXv + libxv portmidi ]; diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index d331f1d14a72..203052505e5e 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -314,7 +314,7 @@ libxcb, libxext, libxml2, - libXv, + libxv, nv-codec-headers, nv-codec-headers-12, ocl-icd, # OpenCL ICD @@ -972,7 +972,7 @@ stdenv.mkDerivation ( ++ optionals withXeve [ xeve ] ++ optionals withXlib [ libx11 - libXv + libxv libxext ] ++ optionals withXml2 [ libxml2 ] diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index d1e731bd882e..a8c80341210f 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -27,7 +27,7 @@ enableX11 ? stdenv.hostPlatform.isLinux, libxext, libxi, - libXv, + libxv, libdrm, enableWayland ? stdenv.hostPlatform.isLinux, wayland-scanner, @@ -113,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals enableX11 [ libxext libxi - libXv + libxv ] ++ lib.optionals enableWayland [ wayland diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index 754acdaf588b..cf612b17c027 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -12,7 +12,7 @@ nvidia_x11: sha256: dbus, vulkan-headers, gtk3, - libXv, + libxv, libxrandr, libxext, libXxf86vm, @@ -88,7 +88,7 @@ let runtimeDependencies = [ libglvnd libxrandr - libXv + libxv ]; runtimeLibraryPath = lib.makeLibraryPath runtimeDependencies; @@ -143,7 +143,7 @@ stdenv.mkDerivation { buildInputs = [ jansson - libXv + libxv libxrandr libxext libXxf86vm