alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

libxkbfile: patch for clang36

Browse source
This commit is contained in:
Eric Seidel 2015-03-24 20:54:47 -07:00
parent 0bfce5bb4a
commit 13dae62ec2
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/servers/x11/xorg/libxkbfile-clang36.patch Normal file
View file

@ -0,0 +1,11 @@
--- libxkbfile-1.0.8/src/cout.c 2012-03-07 20:37:23.000000000 -0800
+++ libxkbfile-1.0.8/src/cout.c 2015-03-24 20:51:11.000000000 -0700
@@ -45,7 +45,7 @@
{
register int i,nOut;
- if ((!xkb)||(!xkb->names)||(!xkb->names->vmods))
+ if ((!xkb)||(!xkb->names))
return False;
for (i=nOut=0;i<XkbNumVirtualMods;i++) {
if (xkb->names->vmods[i]!=None) {

4
pkgs/servers/x11/xorg/overrides.nix
View file

@ -79,6 +79,10 @@ in
nativeBuildInputs = [ args.python ]; nativeBuildInputs = [ args.python ];
}; };
libxkbfile = attrs: attrs // {
patches = lib.optional (stdenv.cc.cc.isClang or false) ./libxkbfile-clang36.patch;
};
libpciaccess = attrs : attrs // { libpciaccess = attrs : attrs // {
patches = [ ./libpciaccess-apple.patch ]; patches = [ ./libpciaccess-apple.patch ];
}; };