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 | |
parent | 51d6b1bdece85e0d136e91b7cead120240698a8c (diff) | |
download | nixlib-f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9.tar nixlib-f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9.tar.gz nixlib-f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9.tar.bz2 nixlib-f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9.tar.lz nixlib-f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9.tar.xz nixlib-f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9.tar.zst nixlib-f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9.zip |
treewide/xorg: replace *proto with xorgproto
Diffstat (limited to 'pkgs/os-specific')
8 files changed, 20 insertions, 29 deletions
diff --git a/pkgs/os-specific/linux/ati-drivers/builder.sh b/pkgs/os-specific/linux/ati-drivers/builder.sh index 6cb8cacbffac..f6ad8e2c03b6 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 bc35d14321b4..24d0aa695f37 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 diff --git a/pkgs/os-specific/linux/directvnc/default.nix b/pkgs/os-specific/linux/directvnc/default.nix index b11a4d6d8f2c..e8c1e9bfe5e5 100644 --- a/pkgs/os-specific/linux/directvnc/default.nix +++ b/pkgs/os-specific/linux/directvnc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, directfb, zlib, libjpeg, xproto }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, directfb, zlib, libjpeg, xorgproto }: stdenv.mkDerivation rec { name = "directvnc-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ directfb zlib libjpeg xproto ]; + buildInputs = [ directfb zlib libjpeg xorgproto ]; meta = with stdenv.lib; { description = "DirectFB VNC client"; diff --git a/pkgs/os-specific/linux/seturgent/default.nix b/pkgs/os-specific/linux/seturgent/default.nix index 42b5317d5562..15582574ecb0 100644 --- a/pkgs/os-specific/linux/seturgent/default.nix +++ b/pkgs/os-specific/linux/seturgent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, xproto, unzip }: +{ stdenv, fetchurl, libX11, xorgproto, unzip }: stdenv.mkDerivation { name = "seturgent-2012-08-17"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; buildInputs = [ - libX11 xproto unzip + libX11 xorgproto unzip ]; installPhase = '' diff --git a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix b/pkgs/os-specific/linux/xf86-input-mtrack/default.nix index ef6e3f4c67f2..2897e9200fd7 100644 --- a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix +++ b/pkgs/os-specific/linux/xf86-input-mtrack/default.nix @@ -5,8 +5,7 @@ , pkgconfig , mtdev , xorgserver -, xproto -, inputproto +, xorgproto , pixman , autoreconfHook }: @@ -19,8 +18,7 @@ stdenv.mkDerivation { pkgconfig mtdev xorgserver - xproto - inputproto + xorgproto pixman autoreconfHook ]; diff --git a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix index 527471bad328..71242348f681 100644 --- a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix +++ b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix @@ -1,12 +1,7 @@ { stdenv , fetchgit , mtdev -, xorgserver -, xproto , pixman -, xextproto -, inputproto -, randrproto , xorg , libpciaccess }: @@ -30,13 +25,11 @@ stdenv.mkDerivation { ''; buildInputs = with xorg; [ - mtdev xproto xextproto inputproto libpciaccess randrproto renderproto - xineramaproto resourceproto scrnsaverproto kbproto libxcb videoproto - dri3proto presentproto + mtdev xorgproto libpciaccess libxcb ]; buildPhase = '' - make INCLUDE="$NIX_CFLAGS_COMPILE -I${xorgserver.dev}/include/xorg -I${pixman}/include/pixman-1 -Iinclude" + make INCLUDE="$NIX_CFLAGS_COMPILE -I${xorg.xorgserver.dev}/include/xorg -I${pixman}/include/pixman-1 -Iinclude" ''; installPhase = '' diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index e0e211642af7..ac095ffaf89b 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl -, inputproto, libX11, libXext, libXi, libXrandr, libXrender -, ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }: +, xorgproto, libX11, libXext, libXi, libXrandr, libXrender +, ncurses, pkgconfig, xorgserver, udev, libXinerama, pixman }: stdenv.mkDerivation rec { name = "xf86-input-wacom-0.36.0"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1xi39hl8ddgj9m7m2k2ll2r3wh0k0aq45fvrsv43651bhz9cbrza"; }; - buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender - ncurses pkgconfig randrproto xorgserver xproto udev libXinerama pixman ]; + buildInputs = [ xorgproto libX11 libXext libXi libXrandr libXrender + ncurses pkgconfig xorgserver udev libXinerama pixman ]; preConfigure = '' mkdir -p $out/share/X11/xorg.conf.d diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/pkgs/os-specific/linux/xf86-video-nested/default.nix index 54d164737705..14d2b249fc08 100644 --- a/pkgs/os-specific/linux/xf86-video-nested/default.nix +++ b/pkgs/os-specific/linux/xf86-video-nested/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchgit, autoreconfHook, fontsproto, libX11, libXext -, pixman, pkgconfig, renderproto, utilmacros, xorgserver +{ stdenv, fetchgit, autoreconfHook, xorgproto, libX11, libXext +, pixman, pkgconfig, utilmacros, xorgserver }: stdenv.mkDerivation { @@ -12,8 +12,8 @@ stdenv.mkDerivation { }; buildInputs = - [ autoreconfHook fontsproto libX11 libXext pixman - pkgconfig renderproto utilmacros xorgserver + [ autoreconfHook xorgproto libX11 libXext pixman + pkgconfig utilmacros xorgserver ]; hardeningDisable = [ "fortify" ]; |