diff options
| author | Lengyel Balazs <ikervagyok@gmail.com> | 2018-12-31 04:40:47 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2019-01-04 14:38:57 +0100 |
| commit | f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9 (patch) | |
| tree | e7ce232c1bce855e2752534bd615b3a2383990a2 /pkgs/os-specific/linux/ati-drivers | |
| parent | 51d6b1bdece85e0d136e91b7cead120240698a8c (diff) | |
| download | nixpkgs-f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9.tar nixpkgs-f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9.tar.gz nixpkgs-f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9.tar.bz2 nixpkgs-f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9.tar.lz nixpkgs-f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9.tar.xz nixpkgs-f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9.tar.zst nixpkgs-f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9.zip | |
treewide/xorg: replace *proto with xorgproto
Diffstat (limited to 'pkgs/os-specific/linux/ati-drivers')
| -rw-r--r-- | pkgs/os-specific/linux/ati-drivers/builder.sh | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/ati-drivers/default.nix | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/ati-drivers/builder.sh b/pkgs/os-specific/linux/ati-drivers/builder.sh index 6cb8cacbffa..f6ad8e2c03b 100644 --- a/pkgs/os-specific/linux/ati-drivers/builder.sh +++ b/pkgs/os-specific/linux/ati-drivers/builder.sh @@ -263,7 +263,7 @@ if test -z "$libsOnly"; then cd programs/fglrx_gamma gcc -fPIC -I${libXxf86vm.dev}/include \ - -I${xf86vidmodeproto}/include \ + -I${xorgproto}/include \ -I$out/X11R6/include \ -L$out/lib \ -Wall -lm -lfglrx_gamma -lX11 -lXext -o $out/bin/fglrx_xgamma fglrx_xgamma.c diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index bc35d14321b..24d0aa695f3 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { libXrandr = xorg.libXrandr; libXrender = xorg.libXrender; libXxf86vm = xorg.libXxf86vm; - xf86vidmodeproto = xorg.xf86vidmodeproto; + xorgproto = xorg.xorgproto; libSM = xorg.libSM; libICE = xorg.libICE; libfreetype = freetype; @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { buildInputs = [ xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM - xorg.libXrandr xorg.libXxf86vm xorg.xf86vidmodeproto xorg.imake xorg.libICE + xorg.libXrandr xorg.libXxf86vm xorg.xorgproto xorg.imake xorg.libICE patchelf unzip libGLU_combined @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { # outputs TODO: probably many fixes are needed; LD_LIBRARY_PATH = makeLibraryPath [ xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM - xorg.libXrandr xorg.libXxf86vm xorg.xf86vidmodeproto xorg.imake xorg.libICE + xorg.libXrandr xorg.libXxf86vm xorg.xorgproto xorg.imake xorg.libICE libGLU_combined fontconfig freetype |