diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2019-05-28 15:09:34 -0400 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-06-17 14:43:18 -0400 |
commit | 263f5891b65c841352f5230a1aa7e22ac418a042 (patch) | |
tree | 0a72ec795d88b01a36455067d803a17b40ca7ab2 /pkgs/servers/x11/xorg/default.nix | |
parent | f7e2bb8cff563d00769a91658d859154f2cda38a (diff) | |
download | nixpkgs-263f5891b65c841352f5230a1aa7e22ac418a042.tar nixpkgs-263f5891b65c841352f5230a1aa7e22ac418a042.tar.gz nixpkgs-263f5891b65c841352f5230a1aa7e22ac418a042.tar.bz2 nixpkgs-263f5891b65c841352f5230a1aa7e22ac418a042.tar.lz nixpkgs-263f5891b65c841352f5230a1aa7e22ac418a042.tar.xz nixpkgs-263f5891b65c841352f5230a1aa7e22ac418a042.tar.zst nixpkgs-263f5891b65c841352f5230a1aa7e22ac418a042.zip |
treewide: mesa_noglu, mesa_drivers, libGL_driver -> mesa
Just use mesa for these to be more clear. Move these to aliases.nix
Diffstat (limited to 'pkgs/servers/x11/xorg/default.nix')
-rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 34aa18465c8..62bc4ed0e00 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1768,7 +1768,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videoamdgpu = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, mesa_noglu, libGL, libdrm, udev, xorgserver }: stdenv.mkDerivation { + xf86videoamdgpu = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, mesa, libGL, libdrm, udev, xorgserver }: stdenv.mkDerivation { name = "xf86-video-amdgpu-19.0.1"; builder = ./builder.sh; src = fetchurl { @@ -1777,7 +1777,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xorgproto mesa_noglu libGL libdrm udev xorgserver ]; + buildInputs = [ xorgproto mesa libGL libdrm udev xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -1820,7 +1820,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videoati = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, mesa_noglu, libGL, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoati = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, mesa, libGL, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-ati-19.0.1"; builder = ./builder.sh; src = fetchurl { @@ -1829,7 +1829,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xorgproto mesa_noglu libGL libdrm udev libpciaccess xorgserver ]; + buildInputs = [ xorgproto mesa libGL libdrm udev libpciaccess xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; |