From 147a685948339fdf3263c30961434928253fa482 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 21 Feb 2019 10:35:01 +0100
Subject: [PATCH 1/3] lmdb: fix cross-compilation

---
 pkgs/development/libraries/lmdb/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix
index 047a74f08409c7..9d57d47218203f 100644
--- a/pkgs/development/libraries/lmdb/default.nix
+++ b/pkgs/development/libraries/lmdb/default.nix
@@ -18,7 +18,11 @@ stdenv.mkDerivation rec {
 
   outputs = [ "bin" "out" "dev" ];
 
-  makeFlags = [ "prefix=$(out)" "CC=cc" ]
+  makeFlags = [
+    "prefix=$(out)"
+    "CC=${stdenv.cc.targetPrefix}cc"
+    "AR=${stdenv.cc.targetPrefix}ar"
+  ]
     ++ stdenv.lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/liblmdb.so";
 
   doCheck = true;

From 5ddfa4183a00be87b36295421b67cb9ab035e9c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 21 Feb 2019 10:35:42 +0100
Subject: [PATCH 2/3] luajit: fix cross-compilation, partially

Also clean the expression a bit.
---
 .../interpreters/luajit/default.nix           | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix
index c95b9e8b8e37e8..abd1fda47cb6d9 100644
--- a/pkgs/development/interpreters/luajit/default.nix
+++ b/pkgs/development/interpreters/luajit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl
+{ stdenv, lib, fetchurl, buildPackages
 , name ? "luajit-${version}"
 , isStable
 , sha256
@@ -20,24 +20,23 @@ stdenv.mkDerivation rec {
 
   luaversion = "5.1";
 
-  patchPhase = ''
-    substituteInPlace Makefile \
-      --replace /usr/local "$out"
-
-    substituteInPlace src/Makefile --replace gcc cc
-  '' + stdenv.lib.optionalString (stdenv.cc.libc != null)
-  ''
-    substituteInPlace Makefile \
-      --replace ldconfig ${stdenv.cc.libc.bin or stdenv.cc.libc}/bin/ldconfig
+  postPatch = ''
+    substituteInPlace Makefile --replace ldconfig :
   '';
 
   configurePhase = false;
 
+  makeFlags = [
+    "PREFIX=$(out)"
+    "DEFAULT_CC=cc"
+    "CROSS=${stdenv.cc.targetPrefix}"
+    # TODO: when pointer size differs, we would need e.g. -m32
+    "HOST_CC=${buildPackages.stdenv.cc}/bin/cc"
+  ];
   buildFlags = [ "amalg" ]; # Build highly optimized version
   enableParallelBuilding = true;
 
-  installPhase   = ''
-      make install PREFIX="$out"
+  postInstall = ''
       ( cd "$out/include"; ln -s luajit-*/* . )
       ln -s "$out"/bin/luajit-* "$out"/bin/lua
     ''

From 98385ff540a36ad86a028b2ec7eeafdba8b3240d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 23 Feb 2019 11:20:45 +0100
Subject: [PATCH 3/3] knot-resolver: cross-compilation fix

---
 pkgs/servers/dns/knot-resolver/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 2affc8ceff25d5..04d0a0cf8d0cad 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -19,6 +19,11 @@ unwrapped = stdenv.mkDerivation rec {
     sha256 = "d1396888ec3a63f19dccdf2b7dbcb0d16a5d8642766824b47f4c21be90ce362b";
   };
 
+  # Short-lived cross fix, as upstream is migrating to meson anyway.
+  postPatch = ''
+    substituteInPlace platform.mk --replace "objdump" "$OBJDUMP"
+  '';
+
   outputs = [ "out" "dev" ];
 
   configurePhase = "patchShebangs scripts/";