ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-08 21:56:03 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #190160 from Artturin/introspectiolddtree

Browse Source
This commit is contained in:
Artturi 2022-09-08 04:28:01 +03:00 committed by GitHub
commit 7f19b75c9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/gobject-introspection/default.nix
View File

@ -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}"

2
pkgs/development/libraries/gobject-introspection/wrapper.nix
View File

@ -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)}"

2
pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner-lddwrapper.sh
View File

@ -1,4 +1,4 @@
#! @bash@/bin/bash
# shellcheck shell=bash
exec @buildobjdump@ -p "$@"
exec @buildlddtree@ "$@"