public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging-next' into staging

Browse Source
This commit is contained in:
Vladimír Čunát 2018-07-17 08:55:31 +02:00
commit e1625a8377
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/mesa/default.nix
View File

@ -67,7 +67,7 @@ let
in in
let let
version = "18.1.2"; version = "18.1.4";
branch = head (splitString "." version); branch = head (splitString "." version);
in in
@ -81,7 +81,7 @@ let self = stdenv.mkDerivation {
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
"https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
]; ];
sha256 = "1ydivzm4c2k53b65lvm11d62z140xlmd7viw63bl5cm5idjg02q7"; sha256 = "12zm9hc3v4wnzhqyrvf2kfnz55idzdn82hs3ry940l45bn5lhq9h";
}; };
prePatch = "patchShebangs ."; prePatch = "patchShebangs .";
@ -207,7 +207,7 @@ let self = stdenv.mkDerivation {
done done
# Update search path used by pkg-config # 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 substituteInPlace "$pc" --replace $out $drivers
done done
'' + optionalString (vulkanDrivers != []) '' '' + optionalString (vulkanDrivers != []) ''