From 140b6e526a3789de8bcfb9d19a24b488440612e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 14 May 2026 03:16:32 +0200 Subject: [PATCH] libva1,libva1-minimal: drop --- pkgs/development/libraries/libva/1.nix | 73 -------------------------- pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 3 -- 3 files changed, 2 insertions(+), 76 deletions(-) delete mode 100644 pkgs/development/libraries/libva/1.nix diff --git a/pkgs/development/libraries/libva/1.nix b/pkgs/development/libraries/libva/1.nix deleted file mode 100644 index 95f6bcf688b7..000000000000 --- a/pkgs/development/libraries/libva/1.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - autoreconfHook, - libx11, - pkg-config, - libxext, - libdrm, - libxfixes, - wayland, - wayland-scanner, - libffi, - libGL, - mesa, - minimal ? false, - libva1-minimal, -}: - -stdenv.mkDerivation rec { - pname = "libva" + lib.optionalString minimal "-minimal"; - # nixpkgs-update: no auto update - version = "1.8.3"; - - src = fetchFromGitHub { - owner = "intel"; - repo = "libva"; - rev = version; - sha256 = "sha256-ur59cqdZqXIY2dDUSie9XsxyRomVBxIW2IVKAgWYC38="; - }; - - outputs = [ - "dev" - "out" - ]; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - wayland-scanner - ]; - - buildInputs = [ - libdrm - ] - ++ lib.optionals (!minimal) [ - libva1-minimal - libx11 - libxext - libxfixes - wayland - libffi - libGL - ]; - # TODO: share libs between minimal and !minimal - perhaps just symlink them - - # Add FHS paths for non-NixOS applications. - configureFlags = - lib.optionals stdenv.hostPlatform.isLinux [ - "--with-drivers-path=${mesa.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" - ] - ++ lib.optionals (!minimal) [ "--enable-glx" ]; - - installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ]; - - meta = { - homepage = "https://www.freedesktop.org/wiki/Software/vaapi/"; - license = lib.licenses.mit; - description = "VAAPI library: Video Acceleration API"; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ SuperSandro2000 ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c94f1eb11bd1..409fbf31ff33 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1150,6 +1150,8 @@ mapAliases { libtransmission_3 = throw "libtransmission_3 has been removed in favour of libtransmission_4. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; # Converted to throw 2025-10-26 libubox-wolfssl = throw "'libubox-wolfssl' has been removed, use 'libubox' or 'libubox-mbedtls'"; # Added 2026-03-29 libuinputplus = throw "'libuinputplus' has been removed, as it was unmaintained upstream since 2021, no longer builds, and is no longer used by anything"; # Added 2025-11-02 + libva1 = throw "'libva1' has been removed, as it is no longer required. Please use libva."; # Added 2026-05-14 + libva1-minimal = throw "'libva1-minimal' has been removed, as it is no longer required. Please use libva-minimal."; # Added 2026-05-14 libviper = throw "'libviper' was removed as it is broken and not maintained upstream"; # Added 2025-05-17 libWindowsWM = libwindowswm; # Added 2026-01-19 libwnck3 = throw "'libwnck3' has been renamed to/replaced by 'libwnck'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4240a5f43969..be4582cb702b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6699,9 +6699,6 @@ with pkgs; libva = libva-minimal.override { minimal = false; }; libva-utils = callPackage ../development/libraries/libva/utils.nix { }; - libva1 = callPackage ../development/libraries/libva/1.nix { }; - libva1-minimal = libva1.override { minimal = true; }; - libwnck = callPackage ../development/libraries/libwnck { }; libwnck2 = callPackage ../development/libraries/libwnck/2.nix { };