gobject-introspection: enable strictDeps and improve cross conditional
the flags defined in it are required if the hostPlatform can't be executed
This commit is contained in:
@@ -64,6 +64,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
})
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
@@ -76,7 +78,7 @@ 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.hostPlatform != stdenv.buildPlatform) [ gobject-introspection-unwrapped ];
|
||||
] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ gobject-introspection-unwrapped ];
|
||||
|
||||
buildInputs = [
|
||||
(python3.withPackages pythonModules)
|
||||
@@ -95,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"--datadir=${placeholder "dev"}/share"
|
||||
"-Dcairo=disabled"
|
||||
"-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 {
|
||||
name = "g-ir-scanner-lddwrapper";
|
||||
isExecutable = true;
|
||||
|
||||
Reference in New Issue
Block a user