diff options
| author | Atemu <atemu.main@gmail.com> | 2023-02-23 18:42:52 +0100 |
|---|---|---|
| committer | Atemu <atemu.main@gmail.com> | 2023-03-25 15:12:38 +0100 |
| commit | c2ebb395cadfd081c015f7da5034b12c145bf6bc (patch) | |
| tree | c7546126b571aed0268158a9d65f257f67df489a /pkgs/development/libraries/mesa | |
| parent | 8f40f2f90b9c9032d1b824442cfbbe0dbabd0dbd (diff) | |
| download | nixpkgs-c2ebb395cadfd081c015f7da5034b12c145bf6bc.tar nixpkgs-c2ebb395cadfd081c015f7da5034b12c145bf6bc.tar.gz nixpkgs-c2ebb395cadfd081c015f7da5034b12c145bf6bc.tar.bz2 nixpkgs-c2ebb395cadfd081c015f7da5034b12c145bf6bc.tar.lz nixpkgs-c2ebb395cadfd081c015f7da5034b12c145bf6bc.tar.xz nixpkgs-c2ebb395cadfd081c015f7da5034b12c145bf6bc.tar.zst nixpkgs-c2ebb395cadfd081c015f7da5034b12c145bf6bc.zip | |
mesa: refactor for multi-version setup
Diffstat (limited to 'pkgs/development/libraries/mesa')
| -rw-r--r-- | pkgs/development/libraries/mesa/22.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/mesa/generic.nix (renamed from pkgs/development/libraries/mesa/default.nix) | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/development/libraries/mesa/22.nix b/pkgs/development/libraries/mesa/22.nix new file mode 100644 index 00000000000..1a1127dae50 --- /dev/null +++ b/pkgs/development/libraries/mesa/22.nix @@ -0,0 +1,4 @@ +import ./generic.nix { + version = "22.3.7"; + hash = "sha256-iUzi9KHC52F3zdIoRiAZLQ2jBmskPuwvux18838TBCw="; +} diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/generic.nix index 83643e423f7..ff2d445a2be 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/generic.nix @@ -1,8 +1,10 @@ +{ version, hash }: + { stdenv, lib, fetchurl , meson, pkg-config, ninja , intltool, bison, flex, file, python3Packages, wayland-scanner , expat, libdrm, xorg, wayland, wayland-protocols, openssl -, llvmPackages, libffi, libomxil-bellagio, libva-minimal +, llvmPackages_15, libffi, libomxil-bellagio, libva-minimal , libelf, libvdpau , libglvnd, libunwind , vulkan-loader, glslang @@ -88,11 +90,11 @@ let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "22.3.7"; - branch = lib.versions.major version; + branch = lib.versions.major version; withLibdrm = lib.meta.availableOn stdenv.hostPlatform libdrm; + llvmPackages = llvmPackages_15; # Align all the Mesa versions used. Required to prevent explosions when # two different LLVMs are loaded in the same process. # FIXME: these should really go into some sort of versioned LLVM package set @@ -120,7 +122,7 @@ self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - hash = "sha256-iUzi9KHC52F3zdIoRiAZLQ2jBmskPuwvux18838TBCw="; + inherit hash; }; # TODO: |