diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-04 14:30:43 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-04 14:30:43 +0100 |
| commit | 7495c61d49208a9fc90b937bca548d9005ff17c8 (patch) | |
| tree | 5eec5f802d3146b8b1f788aa1275ea1c44a24d31 /pkgs/servers/x11 | |
| parent | ed867a50eb89a90db3b1741bf4c0bf0cd4557dba (diff) | |
| parent | 899d81b37ba6dc26431b82b40300505f19504e03 (diff) | |
| download | nixlib-7495c61d49208a9fc90b937bca548d9005ff17c8.tar nixlib-7495c61d49208a9fc90b937bca548d9005ff17c8.tar.gz nixlib-7495c61d49208a9fc90b937bca548d9005ff17c8.tar.bz2 nixlib-7495c61d49208a9fc90b937bca548d9005ff17c8.tar.lz nixlib-7495c61d49208a9fc90b937bca548d9005ff17c8.tar.xz nixlib-7495c61d49208a9fc90b937bca548d9005ff17c8.tar.zst nixlib-7495c61d49208a9fc90b937bca548d9005ff17c8.zip | |
Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
Conflicts: pkgs/applications/editors/vim/macvim.nix
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 246ed94cd1ab..fd5e863d5990 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -69,12 +69,15 @@ in }; libX11 = attrs: attrs // { - preConfigure = setMalloc0ReturnsNullCrossCompiling; + preConfigure = setMalloc0ReturnsNullCrossCompiling + '' + sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure + ''; postInstall = '' # Remove useless DocBook XML files. rm -rf $out/share/doc ''; + CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -"; }; libXfont = attrs: attrs // { @@ -99,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 |