From 78cfe899fdcae265cee33dbba4f8b4508aef2f67 Mon Sep 17 00:00:00 2001 From: squalus Date: Thu, 12 May 2022 18:56:24 -0700 Subject: [PATCH] librsvg: fix cross compile - use docutils for buildPlatform - disable the postFixup step when withIntrospection is disabled --- pkgs/development/libraries/librsvg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index c442c14b5179..a1dde0bdb794 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -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" '';