summary refs log tree commit diff
path: root/pkgs/development/libraries/allegro
diff options
context:
space:
mode:
authorLengyel Balazs <ikervagyok@gmail.com>2018-12-31 04:40:47 +0100
committerRobin Gloster <mail@glob.in>2019-01-04 14:38:57 +0100
commitf4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9 (patch)
treee7ce232c1bce855e2752534bd615b3a2383990a2 /pkgs/development/libraries/allegro
parent51d6b1bdece85e0d136e91b7cead120240698a8c (diff)
downloadnixpkgs-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/development/libraries/allegro')
-rw-r--r--pkgs/development/libraries/allegro/5.nix16
-rw-r--r--pkgs/development/libraries/allegro/default.nix10
2 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix
index 269a139a3d6..9f8ca69a70f 100644
--- a/pkgs/development/libraries/allegro/5.nix
+++ b/pkgs/development/libraries/allegro/5.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchFromGitHub, fetchpatch, texinfo, libXext, xextproto, libX11, xproto
+{ stdenv, fetchFromGitHub, fetchpatch, texinfo, libXext, xorgproto, libX11
 , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis
-, libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto
-, xf86vidmodeproto, libXxf86vm, openal, libGLU_combined, kbproto, libjpeg, flac
-, inputproto, libXi, fixesproto, libXfixes, freetype, libopus, libtheora
+, libXxf86dga, libXxf86misc
+, libXxf86vm, openal, libGLU_combined, libjpeg, flac
+, libXi, libXfixes, freetype, libopus, libtheora
 , physfs, enet, pkgconfig, gtk2, pcre, libpulseaudio, libpthreadstubs
 , libXdmcp
 }:
@@ -19,11 +19,11 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor
+    texinfo libXext xorgproto libX11 libXpm libXt libXcursor
     alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc
-    xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal libGLU_combined
-    kbproto libjpeg flac
-    inputproto libXi fixesproto libXfixes
+    libXxf86vm openal libGLU_combined
+    libjpeg flac
+    libXi libXfixes
     enet libtheora freetype physfs libopus pkgconfig gtk2 pcre libXdmcp
     libpulseaudio libpthreadstubs
   ];
diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix
index 133c0726acb..eca32b740e3 100644
--- a/pkgs/development/libraries/allegro/default.nix
+++ b/pkgs/development/libraries/allegro/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, texinfo, libXext, xextproto, libX11, xproto
+{ stdenv, fetchurl, texinfo, libXext, xorgproto, libX11
 , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis
-, libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto
-, xf86vidmodeproto, libXxf86vm, openal, libGLU_combined }:
+, libXxf86dga, libXxf86misc
+, libXxf86vm, openal, libGLU_combined }:
 
 stdenv.mkDerivation rec {
   name = "allegro-${version}";
@@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor
+    texinfo libXext xorgproto libX11 libXpm libXt libXcursor
     alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc
-    xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal libGLU_combined
+    libXxf86vm openal libGLU_combined
   ];
 
   hardeningDisable = [ "format" ];