diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2020-10-15 16:22:14 +0200 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2020-11-08 22:56:55 +0100 |
| commit | 197ddbced2ae72efbef0f5f8838a7ad3fbd986eb (patch) | |
| tree | b3710d7591f6f721e1a3bb7e1e04204abad78e52 | |
| parent | 420daef820fa65b67c468f1e2ba41e75feb322de (diff) | |
| download | nixlib-197ddbced2ae72efbef0f5f8838a7ad3fbd986eb.tar nixlib-197ddbced2ae72efbef0f5f8838a7ad3fbd986eb.tar.gz nixlib-197ddbced2ae72efbef0f5f8838a7ad3fbd986eb.tar.bz2 nixlib-197ddbced2ae72efbef0f5f8838a7ad3fbd986eb.tar.lz nixlib-197ddbced2ae72efbef0f5f8838a7ad3fbd986eb.tar.xz nixlib-197ddbced2ae72efbef0f5f8838a7ad3fbd986eb.tar.zst nixlib-197ddbced2ae72efbef0f5f8838a7ad3fbd986eb.zip | |
mesa: Replace all usages of old aliases
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/ungoogled-chromium/common.nix | 4 | ||||
| -rw-r--r-- | pkgs/games/katago/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 76f53dcecc87..92403598a038 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -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) diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix index de409f80370f..fd5a86044551 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix @@ -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) diff --git a/pkgs/games/katago/default.nix b/pkgs/games/katago/default.nix index 20ad47d3e0a8..0f9e4b8d67a8 100644 --- a/pkgs/games/katago/default.nix +++ b/pkgs/games/katago/default.nix @@ -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 diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 41024876d554..f8228f457012 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 |