diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 85570becf6978..de40e6c7f1bbe 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -69,6 +69,7 @@ in stdenv.mkDerivation (rec { preConfigure = stdenv.lib.optionalString (targetPlatform != hostPlatform)'' sed 's|#BuildFlavour = quick-cross|BuildFlavour = perf-cross|' mk/build.mk.sample > mk/build.mk echo 'Stage1Only = YES' >> mk/build.mk + echo 'STRIP_CMD = ${binutils}/bin/${prefix}strip' >> mk/build.mk '' + stdenv.lib.optionalString (targetPlatform != hostPlatform && dynamic) '' echo 'DYNAMIC_GHC_PROGRAMS = YES' >> mk/build.mk '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' @@ -234,4 +235,9 @@ in stdenv.mkDerivation (rec { patches = [ ./android-patches/enable-fPIC.patch ]; +} // stdenv.lib.optionalAttrs (buildPlatform != targetPlatform) { + # Nix uses the native strip on libraries, leading to error like this + # https://github.com/neurocyte/ghc-android/issues/29 + dontStrip = true; + dontCrossStrip = true; }) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index fba42b1f2fbf4..44593ae6ff198 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -41,7 +41,7 @@ in , license , maintainers ? [] , doCoverage ? false -, doHaddock ? !(ghc.isHaLVM or false) +, doHaddock ? !(isCross || ghc.isHaLVM or false) , passthru ? {} , pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [], benchmarkPkgconfigDepends ? [] , testDepends ? [], testHaskellDepends ? [], testSystemDepends ? [] diff --git a/pkgs/os-specific/linux/devmem2/default.nix b/pkgs/os-specific/linux/devmem2/default.nix index 17450f36daac9..f230012e4c699 100644 --- a/pkgs/os-specific/linux/devmem2/default.nix +++ b/pkgs/os-specific/linux/devmem2/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildCommand = '' export hardeningDisable=format # fix compile error - cc "$src" -o devmem2 + $CC "$src" -o devmem2 install -D devmem2 "$out/bin/devmem2" ''; diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index 232eb68c8a608..dceaa4bd60b32 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib }: +{ stdenv, fetchurl, zlib, lib, buildPackages, buildPlatform, hostPlatform}: stdenv.mkDerivation rec { name = "file-${version}"; @@ -12,10 +12,9 @@ stdenv.mkDerivation rec { sha256 = "1vp4zihaxkhi85chkjgd4r4zdg4k2wa3c6pmajhbmx6gr7d8ii89"; }; - buildInputs = [ zlib ]; - - doCheck = true; + buildInputs = [ zlib ] ++ lib.optionals (buildPlatform != hostPlatform) [ buildPackages.file ]; + doCheck = buildPlatform == hostPlatform; meta = with stdenv.lib; { homepage = "http://darwinsys.com/file";