From 75d86f0e79ded9fcc28ee8b62a08fbc170e06469 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 14 Jul 2022 10:52:00 +0000
Subject: [PATCH 1/2] djvulibre: move librsvg to nativeBuildInputs
librsvg is only at build time, for generating icons with
rsvg-convert. Previously, when cross compiling, rsvg-convert wouldn't
be found, and icon generation would be disabled.
---
pkgs/applications/misc/djvulibre/default.nix | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix
index 5119dd48e0da..e0057693a3be 100644
--- a/pkgs/applications/misc/djvulibre/default.nix
+++ b/pkgs/applications/misc/djvulibre/default.nix
@@ -4,6 +4,7 @@
, libtiff
, librsvg
, libiconv
+, bash
}:
stdenv.mkDerivation rec {
@@ -17,11 +18,16 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "dev" "out" ];
+ strictDeps = true;
+ nativeBuildInputs = [
+ librsvg
+ ];
+
buildInputs = [
libjpeg
libtiff
- librsvg
libiconv
+ bash
];
meta = with lib; {
From 2b5b344788b5097201838277580ffc3e724cf17b Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 14 Jul 2022 10:53:25 +0000
Subject: [PATCH 2/2] djvulibre: enable parallel building
Tested at -j48.
---
pkgs/applications/misc/djvulibre/default.nix | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix
index e0057693a3be..97feebefa5d3 100644
--- a/pkgs/applications/misc/djvulibre/default.nix
+++ b/pkgs/applications/misc/djvulibre/default.nix
@@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
bash
];
+ enableParallelBuilding = true;
+
meta = with lib; {
description = "The big set of CLI tools to make/modify/optimize/show/export DJVU files";
homepage = "http://djvu.sourceforge.net";