From fc0b7c984cfd0467cbfb1a24be249ec441da764a Mon Sep 17 00:00:00 2001 From: Michishige Kaito Date: Sat, 23 Jun 2018 11:24:13 +0100 Subject: mesa: 18.0.3 -> 18.1.2 --- pkgs/development/libraries/mesa/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/development/libraries/mesa/default.nix') diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index f8152bea2cc1..08bf0463955a 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -2,7 +2,7 @@ , pkgconfig, intltool, autoreconfHook, substituteAll , file, expat, libdrm, xorg, wayland, wayland-protocols, openssl , llvmPackages, libffi, libomxil-bellagio, libva-minimal -, libelf, libvdpau, valgrind-light, python2 +, libelf, libvdpau, valgrind-light, python2, python27Packages , libglvnd , grsecEnabled ? false , enableRadv ? true @@ -67,7 +67,7 @@ let in let - version = "18.0.3"; + version = "18.1.2"; 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 = "0c4yskqwmh5k0wavjrkfcldafvnpcx8gjcx584bscxks69krd789"; + sha256 = "1ydivzm4c2k53b65lvm11d62z140xlmd7viw63bl5cm5idjg02q7"; }; prePatch = "patchShebangs ."; @@ -154,7 +154,7 @@ let self = stdenv.mkDerivation { libX11 libXext libxcb libXt libXfixes libxshmfence libffi wayland wayland-protocols libvdpau libelf libXvMC libomxil-bellagio libva-minimal libpthreadstubs openssl/*or another sha1 provider*/ - valgrind-light python2 + valgrind-light python2 python27Packages.Mako ]; enableParallelBuilding = true; -- cgit 1.4.1 From 722dd05b140504eb2727e55054485b4f003872d0 Mon Sep 17 00:00:00 2001 From: Michishige Kaito Date: Sun, 24 Jun 2018 15:10:05 +0100 Subject: mesa: point pkgconfig at $drivers --- pkgs/development/libraries/mesa/default.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'pkgs/development/libraries/mesa/default.nix') diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index f8152bea2cc1..87a4833b7788 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -205,6 +205,11 @@ let self = stdenv.mkDerivation { for js in $drivers/share/glvnd/egl_vendor.d/*.json; do substituteInPlace "$js" --replace '"libEGL_' '"'"$drivers/lib/libEGL_" done + + # Update search path used by pkg-config + for pc in $dev/lib/pkgconfig/*.pc; do + substituteInPlace "$pc" --replace $out $drivers + done '' + optionalString (vulkanDrivers != []) '' # Update search path used by Vulkan (it's pointing to $out but # drivers are in $drivers) -- cgit 1.4.1 From 3b6970542a0321db0a9752aa22c41b02fe78a9b0 Mon Sep 17 00:00:00 2001 From: Michishige Kaito Date: Tue, 26 Jun 2018 10:54:03 +0100 Subject: Remove unnecessary reference to python27Packages --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/mesa/default.nix') diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 08bf0463955a..1bc1dd21a9d8 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -2,7 +2,7 @@ , pkgconfig, intltool, autoreconfHook, substituteAll , file, expat, libdrm, xorg, wayland, wayland-protocols, openssl , llvmPackages, libffi, libomxil-bellagio, libva-minimal -, libelf, libvdpau, valgrind-light, python2, python27Packages +, libelf, libvdpau, valgrind-light, python2 , libglvnd , grsecEnabled ? false , enableRadv ? true @@ -154,7 +154,7 @@ let self = stdenv.mkDerivation { libX11 libXext libxcb libXt libXfixes libxshmfence libffi wayland wayland-protocols libvdpau libelf libXvMC libomxil-bellagio libva-minimal libpthreadstubs openssl/*or another sha1 provider*/ - valgrind-light python2 python27Packages.Mako + valgrind-light python2 python2.pkgs.Mako ]; enableParallelBuilding = true; -- cgit 1.4.1 From 2bd8e98eba5798ae948335da6db304fe10626904 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Mon, 16 Jul 2018 17:47:24 +0200 Subject: 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(-) (limited to 'pkgs/development/libraries/mesa/default.nix') diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 563b37cac364..086184664cd6 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 != []) '' -- cgit 1.4.1 From 9d0336a2bbe933c1a8e6ea7c7b39eb7ff071ef66 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Wed, 11 Jul 2018 19:48:46 +0300 Subject: mesa: 18.1.2 -> 18.1.4 Picked from #43378. --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/mesa/default.nix') diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 086184664cd6..9c0bf29d4908 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 ."; -- cgit 1.4.1