[staging] Mesa 25.1, but only the world rebuildy bits (#405023)

authored by K900 and committed by GitHub f171d9c0 41e90a8b

+4 -24
-13
pkgs/development/libraries/mesa/gbm-header.patch
··· 1 - diff --git a/src/gbm/meson.build b/src/gbm/meson.build 2 - index eaed028d049..1a826c8792d 100644 3 - --- a/src/gbm/meson.build 4 - +++ b/src/gbm/meson.build 5 - @@ -43,7 +43,7 @@ if with_tests 6 - test('gbm-abi-check', abi_check, suite : ['gbm']) 7 - endif 8 - 9 - -install_headers('main/gbm.h') 10 - +install_headers('main/gbm.h', 'main/gbm_backend_abi.h') 11 - 12 - pkg.generate( 13 - name : 'gbm',
+2 -9
pkgs/development/libraries/mesa/gbm.nix
··· 20 20 21 21 # We don't use the versions from common.nix, because libgbm is a world rebuild, 22 22 # so the updates need to happen separately on staging. 23 - version = "25.0.1"; 23 + version = "25.1.0"; 24 24 25 25 src = fetchFromGitLab { 26 26 domain = "gitlab.freedesktop.org"; 27 27 owner = "mesa"; 28 28 repo = "mesa"; 29 29 rev = "mesa-${version}"; 30 - hash = "sha256-9D4d7EEdZysvXDRcmpbyt85Lo64sldNRomp6/HUVORo="; 30 + hash = "sha256-UlI+6OMUj5F6uVAw+Mg2wOZrjfdRq73d1qufaXVI/go"; 31 31 }; 32 - 33 - # Install gbm_backend_abi.h header - this is to simplify future iteration 34 - # on building Mesa and friends with system libgbm. 35 - # See also: 36 - # - https://github.com/NixOS/nixpkgs/pull/387292 37 - # - https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33890 38 - patches = [ ./gbm-header.patch ]; 39 32 40 33 mesonAutoFeatures = "disabled"; 41 34
+2 -2
pkgs/development/libraries/mesa/headers.nix
··· 16 16 pname = "mesa-gl-headers"; 17 17 18 18 # These are a bigger rebuild and don't change often, so keep them separate. 19 - version = "25.0.1"; 19 + version = "25.1.0"; 20 20 21 21 src = fetchFromGitLab { 22 22 domain = "gitlab.freedesktop.org"; 23 23 owner = "mesa"; 24 24 repo = "mesa"; 25 25 rev = "mesa-${version}"; 26 - hash = "sha256-9D4d7EEdZysvXDRcmpbyt85Lo64sldNRomp6/HUVORo="; 26 + hash = "sha256-UlI+6OMUj5F6uVAw+Mg2wOZrjfdRq73d1qufaXVI/go"; 27 27 }; 28 28 29 29 dontBuild = true;