mesa: Replace all usages of old aliases
This commit is contained in:
parent
420daef820
commit
197ddbced2
|
@ -22,7 +22,7 @@
|
|||
# optional dependencies
|
||||
, libgcrypt ? null # gnomeSupport || cupsSupport
|
||||
, libva ? null # useVaapi
|
||||
, libdrm ? null, wayland ? null, mesa_drivers ? null, libxkbcommon ? null # useOzone
|
||||
, libdrm ? null, wayland ? null, mesa ? null, libxkbcommon ? null # useOzone
|
||||
|
||||
# package customization
|
||||
, useOzone ? false
|
||||
|
@ -146,7 +146,7 @@ let
|
|||
++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
|
||||
++ optionals cupsSupport [ libgcrypt cups ]
|
||||
++ optional pulseSupport libpulseaudio
|
||||
++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ];
|
||||
++ optionals useOzone [ libdrm wayland mesa.drivers libxkbcommon ];
|
||||
|
||||
patches = [
|
||||
./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed)
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
# optional dependencies
|
||||
, libgcrypt ? null # gnomeSupport || cupsSupport
|
||||
, libva ? null # useVaapi
|
||||
, libdrm ? null, wayland ? null, mesa_drivers ? null, libxkbcommon ? null # useOzone
|
||||
, libdrm ? null, wayland ? null, mesa ? null, libxkbcommon ? null # useOzone
|
||||
|
||||
# package customization
|
||||
, useOzone ? false
|
||||
|
@ -153,7 +153,7 @@ let
|
|||
++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
|
||||
++ optionals cupsSupport [ libgcrypt cups ]
|
||||
++ optional pulseSupport libpulseaudio
|
||||
++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ];
|
||||
++ optionals useOzone [ libdrm wayland mesa.drivers libxkbcommon ];
|
||||
|
||||
patches = [
|
||||
./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed)
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
, fetchpatch
|
||||
, cudnn ? null
|
||||
, cudatoolkit ? null
|
||||
, libGL_driver ? null
|
||||
, mesa ? null
|
||||
, opencl-headers ? null
|
||||
, ocl-icd ? null
|
||||
, gperftools ? null
|
||||
|
@ -25,7 +25,7 @@ assert !enableGPU -> (
|
|||
!enableCuda);
|
||||
|
||||
assert enableCuda -> (
|
||||
libGL_driver != null &&
|
||||
mesa != null &&
|
||||
cudatoolkit != null &&
|
||||
cudnn != null);
|
||||
|
||||
|
@ -65,7 +65,7 @@ in env.mkDerivation rec {
|
|||
eigen
|
||||
] ++ lib.optionals (enableGPU && enableCuda) [
|
||||
cudnn
|
||||
libGL_driver
|
||||
mesa.drivers
|
||||
] ++ lib.optionals (enableGPU && !enableCuda) [
|
||||
opencl-headers
|
||||
ocl-icd
|
||||
|
|
|
@ -261,7 +261,7 @@ mapAliases ({
|
|||
libgnome_keyring = libgnome-keyring; # added 2018-02-25
|
||||
libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25
|
||||
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
|
||||
libjpeg_drop = libjpeg_original; # added 2020-06-05
|
||||
libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28
|
||||
|
|
Loading…
Reference in New Issue