nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-19 20:23:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

mesa_22_3: drop

Browse Source
This commit is contained in:
Yureka 2023-05-27 20:51:53 +02:00
parent 0b6c1a7be0
commit d3edadc491
4 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/mesa/22.3.nix
View File

@ -1,4 +0,0 @@
import ./generic.nix {
version = "22.3.7";
hash = "sha256-iUzi9KHC52F3zdIoRiAZLQ2jBmskPuwvux18838TBCw=";
}

4
pkgs/development/libraries/mesa/23.0.nix
View File

@ -1,4 +0,0 @@
import ./generic.nix {
version = "23.0.3";
hash = "sha256-OGNipdgN87CWY2tn80Dhzme3BbRHZ9W90R0u0QNxktU=";
}

5
pkgs/development/libraries/mesa/generic.nix → pkgs/development/libraries/mesa/default.nix
View File

@ -1,5 +1,3 @@
{ version, hash }:
{ stdenv, lib, fetchurl, fetchpatch { stdenv, lib, fetchurl, fetchpatch
, meson, pkg-config, ninja , meson, pkg-config, ninja
, intltool, bison, flex, file, python3Packages, wayland-scanner , intltool, bison, flex, file, python3Packages, wayland-scanner
@ -87,6 +85,9 @@
*/ */
let let
version = "23.0.3";
hash = "sha256-OGNipdgN87CWY2tn80Dhzme3BbRHZ9W90R0u0QNxktU=";
# Release calendar: https://www.mesa3d.org/release-calendar.html # Release calendar: https://www.mesa3d.org/release-calendar.html
# Release frequency: https://www.mesa3d.org/releasing.html#schedule # Release frequency: https://www.mesa3d.org/releasing.html#schedule
branch = lib.versions.major version; branch = lib.versions.major version;

9
pkgs/top-level/all-packages.nix
View File

@ -23005,17 +23005,10 @@ with pkgs;
# Default libGLU # Default libGLU
libGLU = mesa_glu; libGLU = mesa_glu;
# Keep Mesa 22.3 for now because 23.0 does not build on Darwin. mesa = darwin.apple_sdk_11_0.callPackage ../development/libraries/mesa {
# FIXME: remove, also investigate why we even need Mesa on Darwin.
mesa_22_3 = darwin.apple_sdk_11_0.callPackage ../development/libraries/mesa/22.3.nix {
inherit (darwin.apple_sdk_11_0.frameworks) OpenGL; inherit (darwin.apple_sdk_11_0.frameworks) OpenGL;
inherit (darwin.apple_sdk_11_0.libs) Xplugin; inherit (darwin.apple_sdk_11_0.libs) Xplugin;
}; };
mesa_23_0 = darwin.apple_sdk_11_0.callPackage ../development/libraries/mesa/23.0.nix {
inherit (darwin.apple_sdk_11_0.frameworks) OpenGL;
inherit (darwin.apple_sdk_11_0.libs) Xplugin;
};
mesa = if stdenv.isDarwin then mesa_22_3 else mesa_23_0;
mesa_glu = callPackage ../development/libraries/mesa-glu { mesa_glu = callPackage ../development/libraries/mesa-glu {
inherit (darwin.apple_sdk.frameworks) ApplicationServices; inherit (darwin.apple_sdk.frameworks) ApplicationServices;