diff options
author | Artturi <Artturin@artturin.com> | 2023-07-23 05:10:14 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-23 05:10:14 +0300 |
commit | 0f9249c498d6f5e375a92a25fb3b26e4ada81565 (patch) | |
tree | 98bd1223249e37d8fe65732b5b0b15b41ef29b29 | |
parent | 375657a0fd089be1326156afa2534f201404b494 (diff) | |
parent | c1718f59e0bd2af933de924a7f97aec785e4c679 (diff) | |
download | nixpkgs-0f9249c498d6f5e375a92a25fb3b26e4ada81565.tar nixpkgs-0f9249c498d6f5e375a92a25fb3b26e4ada81565.tar.gz nixpkgs-0f9249c498d6f5e375a92a25fb3b26e4ada81565.tar.bz2 nixpkgs-0f9249c498d6f5e375a92a25fb3b26e4ada81565.tar.lz nixpkgs-0f9249c498d6f5e375a92a25fb3b26e4ada81565.tar.xz nixpkgs-0f9249c498d6f5e375a92a25fb3b26e4ada81565.tar.zst nixpkgs-0f9249c498d6f5e375a92a25fb3b26e4ada81565.zip |
Merge pull request #244602 from NickCao/librsvg-cross
-rw-r--r-- | pkgs/development/libraries/librsvg/default.nix | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 9974826573a..6542fdfb14f 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -141,18 +141,19 @@ stdenv.mkDerivation (finalAttrs: { ''; # Not generated when cross compiling. - postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) '' - # Merge gdkpixbuf and librsvg loaders - cat ${lib.getLib gdk-pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache $GDK_PIXBUF/loaders.cache > $GDK_PIXBUF/loaders.cache.tmp - mv $GDK_PIXBUF/loaders.cache.tmp $GDK_PIXBUF/loaders.cache - - mkdir -p "$out/share/bash-completion/completions/" - $out/bin/rsvg-convert --completion bash > "$out/share/bash-completion/completions/rsvg-convert" - mkdir -p "$out/share/zsh/site-functions/" - $out/bin/rsvg-convert --completion zsh > "$out/share/zsh/site-functions/_rsvg-convert" - mkdir -p "$out/share/fish/vendor_completions.d/" - $out/bin/rsvg-convert --completion fish > "$out/share/fish/vendor_completions.d/rsvg-convert.fish" - ''; + postInstall = let emulator = stdenv.hostPlatform.emulator buildPackages; in + lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) '' + # Merge gdkpixbuf and librsvg loaders + cat ${lib.getLib gdk-pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache $GDK_PIXBUF/loaders.cache > $GDK_PIXBUF/loaders.cache.tmp + mv $GDK_PIXBUF/loaders.cache.tmp $GDK_PIXBUF/loaders.cache + + mkdir -p "$out/share/bash-completion/completions/" + ${emulator} $out/bin/rsvg-convert --completion bash > "$out/share/bash-completion/completions/rsvg-convert" + mkdir -p "$out/share/zsh/site-functions/" + ${emulator} $out/bin/rsvg-convert --completion zsh > "$out/share/zsh/site-functions/_rsvg-convert" + mkdir -p "$out/share/fish/vendor_completions.d/" + ${emulator} $out/bin/rsvg-convert --completion fish > "$out/share/fish/vendor_completions.d/rsvg-convert.fish" + ''; postFixup = lib.optionalString withIntrospection '' # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. |