diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index bd2873a04070..175a149e5c6b 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: { isExecutable = true; src = ./wrappers/g-ir-scanner-lddwrapper.sh; inherit (buildPackages) bash; - buildobjdump = "${buildPackages.stdenv.cc.bintools}/bin/objdump"; + buildlddtree = "${buildPackages.pax-utils}/bin/lddtree"; }}" "-Dgi_cross_use_prebuilt_gi=true" "-Dgi_cross_binary_wrapper=${stdenv.hostPlatform.emulator buildPackages}" diff --git a/pkgs/development/libraries/gobject-introspection/wrapper.nix b/pkgs/development/libraries/gobject-introspection/wrapper.nix index 132104c1f645..f887b7d18c77 100644 --- a/pkgs/development/libraries/gobject-introspection/wrapper.nix +++ b/pkgs/development/libraries/gobject-introspection/wrapper.nix @@ -27,7 +27,7 @@ in export bash="${buildPackages.bash}" export emulator=${lib.escapeShellArg (stdenv.targetPlatform.emulator buildPackages)} export emulatorwrapper="$dev/bin/g-ir-scanner-qemuwrapper" - export buildobjdump="${buildPackages.stdenv.cc.bintools}/bin/objdump" + export buildlddtree="${buildPackages.pax-utils}/bin/lddtree" export targetgir="${lib.getDev (targetPackages.gobject-introspection-unwrapped.override argsForTarget)}" diff --git a/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner-lddwrapper.sh b/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner-lddwrapper.sh index 1bf9c3659dc5..f9c2a29f1442 100644 --- a/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner-lddwrapper.sh +++ b/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner-lddwrapper.sh @@ -1,4 +1,4 @@ #! @bash@/bin/bash # shellcheck shell=bash -exec @buildobjdump@ -p "$@" +exec @buildlddtree@ "$@"