diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-03-05 14:53:38 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-03-05 14:53:38 +0100 |
| commit | 04c31a5de10a64c52440846f47b22a8e7312081c (patch) | |
| tree | 10480d9676fef8ba2f859f60adc943e236ddf49b /pkgs/top-level | |
| parent | 565bd805e6aea9258ead5449b46c5e56ae0568fb (diff) | |
| download | nixlib-04c31a5de10a64c52440846f47b22a8e7312081c.tar nixlib-04c31a5de10a64c52440846f47b22a8e7312081c.tar.gz nixlib-04c31a5de10a64c52440846f47b22a8e7312081c.tar.bz2 nixlib-04c31a5de10a64c52440846f47b22a8e7312081c.tar.lz nixlib-04c31a5de10a64c52440846f47b22a8e7312081c.tar.xz nixlib-04c31a5de10a64c52440846f47b22a8e7312081c.tar.zst nixlib-04c31a5de10a64c52440846f47b22a8e7312081c.zip | |
libGL rename: fallout after a week on master
and a few nitpicks.
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbe15aca5d81..f09d02034224 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8599,7 +8599,7 @@ with pkgs; # Multi-arch "drivers" which we want to build for i686. driversi686Linux = recurseIntoAttrs { inherit (pkgsi686Linux) - mesa_noglu + mesa_drivers vaapiIntel libvdpau-va-gl vaapiVdpau @@ -12775,7 +12775,7 @@ with pkgs; inherit (buildPackages) pkgconfig xmlto asciidoc flex bison; inherit (darwin) apple_sdk cf-private libobjc; bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null; - mesa = mesa_noglu; + mesa = libGL; python = python2; # Incompatible with Python 3x udev = if stdenv.isLinux then udev else null; libdrm = if stdenv.isLinux then libdrm else null; |