Merge pull request #84415 from matthewbauer/mb-cross-fixes-april2020

Cross compilation fixes [april 2020]
2020-04-13 16:48:38 -04:00
parent 940c35568b c6ff360cc4
commit e520d6af29
36 changed files with 187 additions and 83 deletions
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {

  nativeBuildInputs = [
    meson ninja pkgconfig gettext python3 libxml2 libxslt docbook_xsl docbook_xml_dtd_43
-    gtk-doc gobject-introspection makeWrapper
+    gtk-doc gobject-introspection makeWrapper glib
  ]
    ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;

@@ -68,7 +68,7 @@ in stdenv.mkDerivation rec {
    + ''
      moveToOutput "bin" "$dev"
      moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out"
-
+    '' + stdenv.lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
      # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/
      $dev/bin/gdk-pixbuf-query-loaders --update-cache
    '';
@@ -14,4 +14,4 @@ findGdkPixbufLoaders() {

 }

-addEnvHooks "$hostOffset" findGdkPixbufLoaders
+addEnvHooks "$targetOffset" findGdkPixbufLoaders