Merge pull request #172789 from squalus/librsvg

librsvg: fix cross compile
main
Sandro 2 years ago committed by GitHub
commit 3af5cd1449
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      pkgs/development/libraries/librsvg/default.nix

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

Loading…
Cancel
Save