diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-09-07 22:14:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-07 22:14:55 -0500 |
| commit | 203d77171c976bbea9e960448ce1c22eba2dadb8 (patch) | |
| tree | a77f735d30451d6edc1aea27a2e2d0edfb924f7d /pkgs/development/libraries/mesa | |
| parent | 16879e2f6ac4d98b4c4e94c940ec535168075327 (diff) | |
| parent | 9f0efc084c30516bba320f60e3066e1eef020c2a (diff) | |
| download | nixpkgs-203d77171c976bbea9e960448ce1c22eba2dadb8.tar nixpkgs-203d77171c976bbea9e960448ce1c22eba2dadb8.tar.gz nixpkgs-203d77171c976bbea9e960448ce1c22eba2dadb8.tar.bz2 nixpkgs-203d77171c976bbea9e960448ce1c22eba2dadb8.tar.lz nixpkgs-203d77171c976bbea9e960448ce1c22eba2dadb8.tar.xz nixpkgs-203d77171c976bbea9e960448ce1c22eba2dadb8.tar.zst nixpkgs-203d77171c976bbea9e960448ce1c22eba2dadb8.zip | |
Merge branch 'staging' into remove-mesa-darwin
Diffstat (limited to 'pkgs/development/libraries/mesa')
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index d771ba7ee8f..fb02366f1c1 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -25,7 +25,7 @@ with stdenv.lib; -if ! lists.elem stdenv.system platforms.mesaPlatforms then +if ! lists.elem stdenv.hostPlatform.system platforms.mesaPlatforms then throw "unsupported platform for Mesa" else @@ -67,7 +67,7 @@ let in let - version = "18.1.5"; + version = "18.1.7"; 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 = "69dbe6f1a6660386f5beb85d4fcf003ee23023ed7b9a603de84e9a37e8d98dea"; + sha256 = "655e3b32ce3bdddd5e6e8768596e5d4bdef82d0dd37067c324cc4b2daa207306"; }; prePatch = "patchShebangs ."; @@ -108,6 +108,7 @@ let self = stdenv.mkDerivation { "--with-gallium-drivers=${concatStringsSep "," galliumDrivers}" "--with-dri-drivers=${concatStringsSep "," driDrivers}" "--with-vulkan-drivers=${concatStringsSep "," vulkanDrivers}" + "--enable-texture-float" (enableFeature stdenv.isLinux "dri3") (enableFeature stdenv.isLinux "nine") # Direct3D in Wine "--enable-libglvnd" |