public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide/xorg: replace *proto with xorgproto

Browse Source
This commit is contained in:
Lengyel Balazs
2019-01-04 14:38:57 +01:00
committed by Robin Gloster
parent 51d6b1bdec
commit f4a53ff3bc
133 changed files with 348 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/allegro/5.nix
+8 -8
View File
@@ -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
];
pkgs/development/libraries/allegro/default.nix
+5 -5
View File
@@ -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" ];