From cac87cf2d542636659b87e82b63fbf6e5b5e7980 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 17 Jun 2026 19:22:56 +0300 Subject: [PATCH] mesa: migrate to finalAttrs --- pkgs/development/libraries/mesa/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 14c690a882c5..8afb9543d51b 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -111,7 +111,6 @@ "screenshot" "vram-report-limit" ], - mesa, mesa-gl-headers, makeSetupHook, }: @@ -143,7 +142,7 @@ let common = import ./common.nix { inherit lib fetchFromGitLab; }; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { inherit (common) pname version @@ -395,20 +394,20 @@ stdenv.mkDerivation { ; # for compatibility - drivers = lib.warn "`mesa.drivers` is deprecated, use `mesa` instead" mesa; + drivers = lib.warn "`mesa.drivers` is deprecated, use `mesa` instead" finalAttrs.finalPackage; tests.outDoesNotDependOnLLVM = stdenv.mkDerivation { name = "mesa-does-not-depend-on-llvm"; buildCommand = '' - echo ${mesa} >>$out + echo ${finalAttrs.finalPackage} >>$out ''; disallowedRequisites = [ llvmPackages.llvm ]; }; llvmpipeHook = makeSetupHook { name = "llvmpipe-hook"; - substitutions.mesa = mesa; + substitutions.mesa = finalAttrs.finalPackage; meta.license = lib.licenses.mit; } ./llvmpipe-hook.sh; }; -} +})