Merge pull request #51180 from mayflower/xorg-cross

treewide: cross-fixes
2018-12-01 00:43:02 +00:00
parent 3a3513e7e7 694b4d29e1
commit 84162175a3
10 changed files with 86 additions and 19 deletions
@@ -60,7 +60,9 @@ stdenv.mkDerivation rec {
    ++ optional (libpaper != null) "--enable-libpaper"
    ++ optional stdenv.isDarwin "--disable-launchd";

+  # AR has to be an absolute path
  preConfigure = ''
+    export AR="${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar"
    configureFlagsArray+=(
      # Put just lib/* and locale into $lib; this didn't work directly.
      # lib/cups is moved back to $out in postInstall.