diff options
| author | Joel Taylor <me@joelt.io> | 2014-08-23 23:15:23 -0700 |
|---|---|---|
| committer | Joel Taylor <me@joelt.io> | 2014-09-09 13:54:57 -0700 |
| commit | afa1db198bc88abea65d61ef6761866ed490ba6b (patch) | |
| tree | 49e27f3abe18abc75243d0df23fa00befb0470ae /pkgs/servers/x11 | |
| parent | fa9b1f9cda5e44795d02df54defc6e8b9a0b2132 (diff) | |
| download | nixlib-afa1db198bc88abea65d61ef6761866ed490ba6b.tar nixlib-afa1db198bc88abea65d61ef6761866ed490ba6b.tar.gz nixlib-afa1db198bc88abea65d61ef6761866ed490ba6b.tar.bz2 nixlib-afa1db198bc88abea65d61ef6761866ed490ba6b.tar.lz nixlib-afa1db198bc88abea65d61ef6761866ed490ba6b.tar.xz nixlib-afa1db198bc88abea65d61ef6761866ed490ba6b.tar.zst nixlib-afa1db198bc88abea65d61ef6761866ed490ba6b.zip | |
fix even more clang builds
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 7073adb85dde..4811659ac413 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -102,8 +102,11 @@ in # Note: most of these are in Requires.private, so maybe builder.sh # should propagate them automatically. libXt = attrs: attrs // { - preConfigure = setMalloc0ReturnsNullCrossCompiling; + preConfigure = setMalloc0ReturnsNullCrossCompiling + '' + sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure + ''; propagatedBuildInputs = [ xorg.libSM ]; + CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -"; }; # See https://bugs.freedesktop.org/show_bug.cgi?id=47792 |