summary refs log tree commit diff
path: root/pkgs/development/libraries/mesa/default.nix
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2018-04-05 11:39:51 -0500
committerWill Dietz <w@wdtz.org>2018-04-05 11:41:49 -0500
commitbf44cf71b7f73287f68f9fe9af85dc662c576112 (patch)
treef810dbead5044d7f4b3acd1d4b16d874280ef21c /pkgs/development/libraries/mesa/default.nix
parentb4a517841b73e16cbc2e5390e7bff210684c82de (diff)
downloadnixlib-bf44cf71b7f73287f68f9fe9af85dc662c576112.tar
nixlib-bf44cf71b7f73287f68f9fe9af85dc662c576112.tar.gz
nixlib-bf44cf71b7f73287f68f9fe9af85dc662c576112.tar.bz2
nixlib-bf44cf71b7f73287f68f9fe9af85dc662c576112.tar.lz
nixlib-bf44cf71b7f73287f68f9fe9af85dc662c576112.tar.xz
nixlib-bf44cf71b7f73287f68f9fe9af85dc662c576112.tar.zst
nixlib-bf44cf71b7f73287f68f9fe9af85dc662c576112.zip
mesa: 17.3.7 -> 17.3.8
https://www.mesa3d.org/relnotes/17.3.8.html

Remove upstreamed portion of musl patch,
always add remaining fix (missing include).
Diffstat (limited to 'pkgs/development/libraries/mesa/default.nix')
-rw-r--r--pkgs/development/libraries/mesa/default.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index c325bb9e1d5e..e77a4e1414e9 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -67,7 +67,7 @@ let
 in
 
 let
-  version = "17.3.7";
+  version = "17.3.8";
   branch  = head (splitString "." version);
 in
 
@@ -81,7 +81,7 @@ let self = stdenv.mkDerivation {
       "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
       "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
     ];
-    sha256 = "07mcfyksspr4xp7fhhdgjhxm0182jhyav11shpzahrdsix591585";
+    sha256 = "1cd6a4ll5arla3kncxnw9196ak1v4rvnb098aa7lm3n4h7r9p7cg";
   };
 
   prePatch = "patchShebangs .";
@@ -92,7 +92,8 @@ let self = stdenv.mkDerivation {
   patches = [
     ./glx_ro_text_segm.patch # fix for grsecurity/PaX
     ./symlink-drivers.patch
-  ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./musl-fixes.patch;
+    ./missing-include.patch # dev_t needs sys/stat.h, fixes build w/musl
+  ];
 
   outputs = [ "out" "dev" "drivers" "osmesa" ];