diff options
| author | Eric Seidel <gridaphobe@gmail.com> | 2015-03-24 20:54:47 -0700 |
|---|---|---|
| committer | Eric Seidel <gridaphobe@gmail.com> | 2015-03-24 20:54:47 -0700 |
| commit | 13dae62ec2621a2c28e131ac59adabe71f0de2ec (patch) | |
| tree | 74e09765c61ba02ca10eaf8ba8c0c976b34f4a9e /pkgs/servers/x11 | |
| parent | 0bfce5bb4a61de3df465b6fc4ca37c88c622ab3d (diff) | |
| download | nixpkgs-13dae62ec2621a2c28e131ac59adabe71f0de2ec.tar nixpkgs-13dae62ec2621a2c28e131ac59adabe71f0de2ec.tar.gz nixpkgs-13dae62ec2621a2c28e131ac59adabe71f0de2ec.tar.bz2 nixpkgs-13dae62ec2621a2c28e131ac59adabe71f0de2ec.tar.lz nixpkgs-13dae62ec2621a2c28e131ac59adabe71f0de2ec.tar.xz nixpkgs-13dae62ec2621a2c28e131ac59adabe71f0de2ec.tar.zst nixpkgs-13dae62ec2621a2c28e131ac59adabe71f0de2ec.zip | |
libxkbfile: patch for clang36
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/libxkbfile-clang36.patch | 11 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 4 |
2 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/libxkbfile-clang36.patch b/pkgs/servers/x11/xorg/libxkbfile-clang36.patch new file mode 100644 index 00000000000..65bf2ea7437 --- /dev/null +++ b/pkgs/servers/x11/xorg/libxkbfile-clang36.patch @@ -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) { diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index bf124282876..61c1391ae09 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -79,6 +79,10 @@ in nativeBuildInputs = [ args.python ]; }; + libxkbfile = attrs: attrs // { + patches = lib.optional (stdenv.cc.cc.isClang or false) ./libxkbfile-clang36.patch; + }; + libpciaccess = attrs : attrs // { patches = [ ./libpciaccess-apple.patch ]; }; |