nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-15 11:08:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

gobject-introspection: use wrapper.nix for the native package too

Browse Source 
so we can propagate the dev output

during the build of i3ipc-glib with strictDeps enabled i noticed that
gobject-introspection was not being detected and it was due to
gobject-introspection path not being in the PKG_CONFIG_PATH variable

this commit makes gobject-introspection get detected when build==host
This commit is contained in:
Artturin 2022-11-09 00:33:42 +02:00
parent 9f1f990aee
commit b2f9cd34e7
3 changed files with 84 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,14 +138,6 @@ stdenv.mkDerivation (finalAttrs: {
rm $out/lib/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary} rm $out/lib/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary}
''; '';
# add self to buildInputs to avoid needing to add gobject-introspection to buildInputs in addition to nativeBuildInputs
# builds use target-pkg-config to look for gobject-introspection instead of just looking for binaries in $PATH
# wrapper uses depsTargetTargetPropagated so ignore it
preFixup = lib.optionalString (!lib.hasSuffix "-wrapped" finalAttrs.pname) ''
mkdir -p $dev/nix-support
echo "$out" > $dev/nix-support/propagated-target-target-deps
'';
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
passthru = { passthru = {

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

@ -9,50 +9,96 @@
# to build, run # to build, run
# `nix build ".#pkgsCross.aarch64-multiplatform.buildPackages.gobject-introspection"` # `nix build ".#pkgsCross.aarch64-multiplatform.buildPackages.gobject-introspection"`
# a comment for both depsTargetTargetPropagated's
# add self to buildInputs to avoid needing to add gobject-introspection to buildInputs in addition to nativeBuildInputs
# builds use target-pkg-config to look for gobject-introspection instead of just looking for binaries in $PATH
let let
# ensure that `.override` works when gobject-introspection == gobject-introspection-wrapped # ensure that `.override` works
args = builtins.removeAttrs _args [ "buildPackages" "targetPackages" "gobject-introspection-unwrapped" ]; args = builtins.removeAttrs _args [ "buildPackages" "targetPackages" "gobject-introspection-unwrapped" ];
# passing this stdenv to `targetPackages...` breaks due to splicing not working in `.override`` # passing this stdenv to `targetPackages...` breaks due to splicing not working in `.override``
argsForTarget = builtins.removeAttrs args [ "stdenv" ]; argsForTarget = builtins.removeAttrs args [ "stdenv" ];
overridenUnwrappedGir = gobject-introspection-unwrapped.override args;
# if we have targetPackages.gobject-introspection then propagate that
overridenTargetUnwrappedGir =
if targetPackages ? gobject-introspection-unwrapped
then targetPackages.gobject-introspection-unwrapped.override argsForTarget
else overridenUnwrappedGir;
in in
(gobject-introspection-unwrapped.override args).overrideAttrs (previousAttrs: { # wrap both pkgsCrossX.buildPackages.gobject-introspection and {pkgs,pkgsSomethingExecutableOnBuildSystem).buildPackages.gobject-introspection
pname = "gobject-introspection-wrapped"; if (!stdenv.hostPlatform.canExecute stdenv.targetPlatform) && stdenv.targetPlatform.emulatorAvailable buildPackages
depsTargetTargetPropagated = [ gobject-introspection-unwrapped ]; then
postFixup = (previousAttrs.postFixup or "") + '' stdenv.mkDerivation
mv $dev/bin/g-ir-compiler $dev/bin/.g-ir-compiler-wrapped (builtins.removeAttrs overridenUnwrappedGir.drvAttrs [ "name" ] # so we can get a fresh name generated from the pname
mv $dev/bin/g-ir-scanner $dev/bin/.g-ir-scanner-wrapped // {
pname = "gobject-introspection-wrapped";
passthru = overridenUnwrappedGir.passthru // {
unwrapped = overridenUnwrappedGir;
};
phases = [ "fixupPhase" ]; # don't remove, it is valid to set phases here.
dontStrip = true;
depsTargetTargetPropagated = [ overridenTargetUnwrappedGir ];
postFixup = ''
${lib.concatMapStrings (output: ''
mkdir -p ${"$" + "${output}"}
${lib.getExe buildPackages.xorg.lndir} ${gobject-introspection-unwrapped.${output}} ${"$" + "${output}"}
'') gobject-introspection-unwrapped.outputs}
( cp $dev/bin/g-ir-compiler $dev/bin/.g-ir-compiler-wrapped
export bash="${buildPackages.bash}" cp $dev/bin/g-ir-scanner $dev/bin/.g-ir-scanner-wrapped
export emulator=${lib.escapeShellArg (stdenv.targetPlatform.emulator buildPackages)}
export emulatorwrapper="$dev/bin/g-ir-scanner-qemuwrapper"
export buildlddtree="${buildPackages.pax-utils}/bin/lddtree"
export targetgir="${lib.getDev (targetPackages.gobject-introspection-unwrapped.override argsForTarget)}" (
rm "$dev/bin/g-ir-compiler"
rm "$dev/bin/g-ir-scanner"
export bash="${buildPackages.bash}"
export emulator=${lib.escapeShellArg (stdenv.targetPlatform.emulator buildPackages)}
export emulatorwrapper="$dev/bin/g-ir-scanner-qemuwrapper"
export buildlddtree="${buildPackages.pax-utils}/bin/lddtree"
substituteAll "${./wrappers/g-ir-compiler.sh}" "$dev/bin/g-ir-compiler" export targetgir="${lib.getDev overridenTargetUnwrappedGir}"
substituteAll "${./wrappers/g-ir-scanner.sh}" "$dev/bin/g-ir-scanner"
substituteAll "${./wrappers/g-ir-scanner-lddwrapper.sh}" "$dev/bin/g-ir-scanner-lddwrapper"
substituteAll "${./wrappers/g-ir-scanner-qemuwrapper.sh}" "$dev/bin/g-ir-scanner-qemuwrapper"
chmod +x $dev/bin/g-ir-*
)
''
# when cross-compiling and using the wrapper then when a package looks up the g_ir_X
# variable with pkg-config they'll get the host version which can't be run
# override the variable to use the absolute path to g_ir_X in PATH which can be run
+ ''
cat >> $dev/nix-support/setup-hook <<-'EOF'
override-pkg-config-gir-variables() {
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_SCANNER="$(type -p g-ir-scanner)"
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_COMPILER="$(type -p g-ir-compiler)"
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_GENERATE="$(type -p g-ir-generate)"
export PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_SCANNER
export PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_COMPILER
export PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_GENERATE
}
preConfigureHooks+=(override-pkg-config-gir-variables) substituteAll "${./wrappers/g-ir-compiler.sh}" "$dev/bin/g-ir-compiler"
EOF substituteAll "${./wrappers/g-ir-scanner.sh}" "$dev/bin/g-ir-scanner"
''; substituteAll "${./wrappers/g-ir-scanner-lddwrapper.sh}" "$dev/bin/g-ir-scanner-lddwrapper"
}) substituteAll "${./wrappers/g-ir-scanner-qemuwrapper.sh}" "$dev/bin/g-ir-scanner-qemuwrapper"
chmod +x $dev/bin/g-ir-compiler
chmod +x $dev/bin/g-ir-scanner*
)
''
# when cross-compiling and using the wrapper then when a package looks up the g_ir_X
# variable with pkg-config they'll get the host version which can't be run
# override the variable to use the absolute path to g_ir_X in PATH which can be run
+ ''
cat >> $dev/nix-support/setup-hook <<-'EOF'
override-pkg-config-gir-variables() {
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_SCANNER="$(type -p g-ir-scanner)"
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_COMPILER="$(type -p g-ir-compiler)"
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_GENERATE="$(type -p g-ir-generate)"
export PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_SCANNER
export PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_COMPILER
export PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_GENERATE
}
preConfigureHooks+=(override-pkg-config-gir-variables)
EOF
'';
})
else
stdenv.mkDerivation (builtins.removeAttrs overridenUnwrappedGir.drvAttrs [ "name" ] # so we can get a fresh name generated from the pname
// {
pname = "gobject-introspection-wrapped";
passthru = overridenUnwrappedGir.passthru // {
unwrapped = overridenUnwrappedGir;
};
phases = [ "fixupPhase" ]; # don't remove, it is valid to set phases here.
dontStrip = true;
depsTargetTargetPropagated = [ overridenTargetUnwrappedGir ];
postFixup = ''
${lib.concatMapStrings (output: ''
mkdir -p ${"$" + "${output}"}
${lib.getExe buildPackages.xorg.lndir} ${gobject-introspection-unwrapped.${output}} ${"$" + "${output}"}
'') gobject-introspection-unwrapped.outputs}
'';
})

3
pkgs/top-level/all-packages.nix
View File

@ -19174,8 +19174,7 @@ with pkgs;
gns3-gui = gns3Packages.guiStable; gns3-gui = gns3Packages.guiStable;
gns3-server = gns3Packages.serverStable; gns3-server = gns3Packages.serverStable;
gobject-introspection = if (!stdenv.hostPlatform.canExecute stdenv.targetPlatform) && stdenv.targetPlatform.emulatorAvailable buildPackages gobject-introspection = callPackage ../development/libraries/gobject-introspection/wrapper.nix { };
then callPackage ../development/libraries/gobject-introspection/wrapper.nix { } else gobject-introspection-unwrapped;
gobject-introspection-unwrapped = callPackage ../development/libraries/gobject-introspection { gobject-introspection-unwrapped = callPackage ../development/libraries/gobject-introspection {
nixStoreDir = config.nix.storeDir or builtins.storeDir; nixStoreDir = config.nix.storeDir or builtins.storeDir;