From 2bd8e98eba5798ae948335da6db304fe10626904 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 16 Jul 2018 17:47:24 +0200
Subject: [PATCH 1/2] mesa: fix overzealous patching of *.pc

PR #42529 (722dd05) broke gbm.pc and consequently virglrenderer build.
---
 pkgs/development/libraries/mesa/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 563b37cac36..086184664cd 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -207,7 +207,7 @@ let self = stdenv.mkDerivation {
     done
 
     # Update search path used by pkg-config
-    for pc in $dev/lib/pkgconfig/*.pc; do
+    for pc in $dev/lib/pkgconfig/{d3d,dri,xatracker}.pc; do
       substituteInPlace "$pc" --replace $out $drivers
     done
   '' + optionalString (vulkanDrivers != []) ''

From 9d0336a2bbe933c1a8e6ea7c7b39eb7ff071ef66 Mon Sep 17 00:00:00 2001
From: Anton-Latukha <anton.latukha@gmail.com>
Date: Wed, 11 Jul 2018 19:48:46 +0300
Subject: [PATCH 2/2] mesa: 18.1.2 -> 18.1.4

Picked from #43378.
---
 pkgs/development/libraries/mesa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 086184664cd..9c0bf29d490 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -67,7 +67,7 @@ let
 in
 
 let
-  version = "18.1.2";
+  version = "18.1.4";
   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 = "1ydivzm4c2k53b65lvm11d62z140xlmd7viw63bl5cm5idjg02q7";
+    sha256 = "12zm9hc3v4wnzhqyrvf2kfnz55idzdn82hs3ry940l45bn5lhq9h";
   };
 
   prePatch = "patchShebangs .";