Merge pull request #172789 from squalus/librsvg

librsvg: fix cross compile
This commit is contained in:
Sandro 2022-05-13 17:29:55 +02:00 committed by GitHub
commit 3af5cd1449
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -17,7 +17,7 @@
, rust
, cargo
, gi-docgen
, python3
, python3Packages
, gnome
, vala
, withIntrospection ? stdenv.hostPlatform == stdenv.buildPlatform
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
pkg-config
rustc
cargo
python3.pkgs.docutils
python3Packages.docutils
vala
rustPlatform.cargoSetupHook
] ++ lib.optionals withIntrospection [
@ -125,7 +125,7 @@ stdenv.mkDerivation rec {
mv $GDK_PIXBUF/loaders.cache.tmp $GDK_PIXBUF/loaders.cache
'';
postFixup = ''
postFixup = lib.optionalString withIntrospection ''
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
moveToOutput "share/doc" "$devdoc"
'';