diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-07-17 08:55:31 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-07-17 08:55:31 +0200 |
| commit | e1625a8377ecce59b1320e556aecdc60b9e6d9db (patch) | |
| tree | 6c17cb318e53e39cec7bb851db763396c1fac030 /pkgs | |
| parent | dca7b10fd52371548870f7a8aba90c39574ca89e (diff) | |
| parent | 9d0336a2bbe933c1a8e6ea7c7b39eb7ff071ef66 (diff) | |
| download | nixlib-e1625a8377ecce59b1320e556aecdc60b9e6d9db.tar nixlib-e1625a8377ecce59b1320e556aecdc60b9e6d9db.tar.gz nixlib-e1625a8377ecce59b1320e556aecdc60b9e6d9db.tar.bz2 nixlib-e1625a8377ecce59b1320e556aecdc60b9e6d9db.tar.lz nixlib-e1625a8377ecce59b1320e556aecdc60b9e6d9db.tar.xz nixlib-e1625a8377ecce59b1320e556aecdc60b9e6d9db.tar.zst nixlib-e1625a8377ecce59b1320e556aecdc60b9e6d9db.zip | |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 563b37cac364..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 ."; @@ -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 != []) '' |