nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 23:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #225172 from Artturin/gir32bitccrossfix

Browse Source
This commit is contained in:
Artturi 2023-04-10 19:58:02 +03:00 committed by GitHub
commit 99998eece8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,8 @@ stdenv.mkDerivation (finalAttrs: {
# Build definition checks for the Python modules needed at runtime by importing them.
(buildPackages.python3.withPackages pythonModules)
finalAttrs.setupHook # move .gir files
] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ gobject-introspection-unwrapped ];
# can't use canExecute, we need prebuilt when cross
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ gobject-introspection-unwrapped ];
buildInputs = [
(python3.withPackages pythonModules)
@ -106,8 +107,10 @@ stdenv.mkDerivation (finalAttrs: {
inherit (buildPackages) bash;
buildlddtree = "${buildPackages.pax-utils}/bin/lddtree";
}}"
"-Dgi_cross_use_prebuilt_gi=true"
"-Dgi_cross_binary_wrapper=${stdenv.hostPlatform.emulator buildPackages}"
# can't use canExecute, we need prebuilt when cross
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
"-Dgi_cross_use_prebuilt_gi=true"
];
doCheck = !stdenv.isAarch64;