cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

gobject-introspection: enable strictDeps and improve cross conditional

Browse source 
the flags defined in it are required if the hostPlatform can't be executed
This commit is contained in:
Artturin 2022-09-01 01:19:16 +03:00
parent acd53be25f
commit 3d1f96e1b4
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/libraries/gobject-introspection/default.nix
View file

@ -64,6 +64,8 @@ stdenv.mkDerivation (finalAttrs: {
}) })
]; ];
strictDeps = true;
nativeBuildInputs = [ nativeBuildInputs = [
meson meson
ninja ninja
@ -76,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
# Build definition checks for the Python modules needed at runtime by importing them. # Build definition checks for the Python modules needed at runtime by importing them.
(buildPackages.python3.withPackages pythonModules) (buildPackages.python3.withPackages pythonModules)
finalAttrs.setupHook # move .gir files finalAttrs.setupHook # move .gir files
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ gobject-introspection-unwrapped ]; ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ gobject-introspection-unwrapped ];
buildInputs = [ buildInputs = [
(python3.withPackages pythonModules) (python3.withPackages pythonModules)
@ -95,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
"--datadir=${placeholder "dev"}/share" "--datadir=${placeholder "dev"}/share"
"-Dcairo=disabled" "-Dcairo=disabled"
"-Dgtk_doc=${lib.boolToString (stdenv.hostPlatform == stdenv.buildPlatform)}" "-Dgtk_doc=${lib.boolToString (stdenv.hostPlatform == stdenv.buildPlatform)}"
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
"-Dgi_cross_ldd_wrapper=${substituteAll { "-Dgi_cross_ldd_wrapper=${substituteAll {
name = "g-ir-scanner-lddwrapper"; name = "g-ir-scanner-lddwrapper";
isExecutable = true; isExecutable = true;