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

mesa: Replace all usages of old aliases

This commit is contained in:
Michael Weiss 2020-10-15 16:22:14 +02:00
parent 420daef820
commit 197ddbced2
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -22,7 +22,7 @@
# optional dependencies # optional dependencies
, libgcrypt ? null # gnomeSupport || cupsSupport , libgcrypt ? null # gnomeSupport || cupsSupport
, libva ? null # useVaapi , libva ? null # useVaapi
, libdrm ? null, wayland ? null, mesa_drivers ? null, libxkbcommon ? null # useOzone , libdrm ? null, wayland ? null, mesa ? null, libxkbcommon ? null # useOzone
# package customization # package customization
, useOzone ? false , useOzone ? false
@ -146,7 +146,7 @@ let
++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
++ optionals cupsSupport [ libgcrypt cups ] ++ optionals cupsSupport [ libgcrypt cups ]
++ optional pulseSupport libpulseaudio ++ optional pulseSupport libpulseaudio
++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ]; ++ optionals useOzone [ libdrm wayland mesa.drivers libxkbcommon ];
patches = [ patches = [
./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed) ./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed)

4
pkgs/applications/networking/browsers/ungoogled-chromium/common.nix
View File

@ -22,7 +22,7 @@
# optional dependencies # optional dependencies
, libgcrypt ? null # gnomeSupport || cupsSupport , libgcrypt ? null # gnomeSupport || cupsSupport
, libva ? null # useVaapi , libva ? null # useVaapi
, libdrm ? null, wayland ? null, mesa_drivers ? null, libxkbcommon ? null # useOzone , libdrm ? null, wayland ? null, mesa ? null, libxkbcommon ? null # useOzone
# package customization # package customization
, useOzone ? false , useOzone ? false
@ -153,7 +153,7 @@ let
++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
++ optionals cupsSupport [ libgcrypt cups ] ++ optionals cupsSupport [ libgcrypt cups ]
++ optional pulseSupport libpulseaudio ++ optional pulseSupport libpulseaudio
++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ]; ++ optionals useOzone [ libdrm wayland mesa.drivers libxkbcommon ];
patches = [ patches = [
./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed) ./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed)

6
pkgs/games/katago/default.nix
View File

@ -9,7 +9,7 @@
, fetchpatch , fetchpatch
, cudnn ? null , cudnn ? null
, cudatoolkit ? null , cudatoolkit ? null
, libGL_driver ? null , mesa ? null
, opencl-headers ? null , opencl-headers ? null
, ocl-icd ? null , ocl-icd ? null
, gperftools ? null , gperftools ? null
@ -25,7 +25,7 @@ assert !enableGPU -> (
!enableCuda); !enableCuda);
assert enableCuda -> ( assert enableCuda -> (
libGL_driver != null && mesa != null &&
cudatoolkit != null && cudatoolkit != null &&
cudnn != null); cudnn != null);
@ -65,7 +65,7 @@ in env.mkDerivation rec {
eigen eigen
] ++ lib.optionals (enableGPU && enableCuda) [ ] ++ lib.optionals (enableGPU && enableCuda) [
cudnn cudnn
libGL_driver mesa.drivers
] ++ lib.optionals (enableGPU && !enableCuda) [ ] ++ lib.optionals (enableGPU && !enableCuda) [
opencl-headers opencl-headers
ocl-icd ocl-icd

2
pkgs/top-level/aliases.nix
View File

@ -261,7 +261,7 @@ mapAliases ({
libgnome_keyring = libgnome-keyring; # added 2018-02-25 libgnome_keyring = libgnome-keyring; # added 2018-02-25
libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25 libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25
libgumbo = gumbo; # added 2018-01-21 libgumbo = gumbo; # added 2018-01-21
libGL_driver = mesa.drivers; libGL_driver = mesa.drivers; # added 2019-05-28
libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14 libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14
libjpeg_drop = libjpeg_original; # added 2020-06-05 libjpeg_drop = libjpeg_original; # added 2020-06-05
libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28