From 76727f875f5543277a20575b13bbd9d66a1cc3a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C5=99emysl=20Eric=20Janouch?=
Date: Fri, 30 Jun 2023 02:33:55 +0200
Subject: [PATCH] Add resvg toggle to fiv, slightly adjust sdn
---
fiv-master.nix | 7 +++++--
sdn-master.nix | 3 ++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/fiv-master.nix b/fiv-master.nix
index a98cd8c..37ab682 100644
--- a/fiv-master.nix
+++ b/fiv-master.nix
@@ -1,6 +1,7 @@
{ pkgs ? import { }
, local ? false
, full ? true
+, withResvg ? false
}:
pkgs.stdenv.mkDerivation rec {
pname = "fiv";
@@ -27,9 +28,10 @@ pkgs.stdenv.mkDerivation rec {
libepoxy
] ++ lib.optionals full [
lcms2
- #resvg
librsvg
libheif
+ ] ++ lib.optionals withResvg [
+ resvg
];
src = if local then
@@ -59,7 +61,6 @@ pkgs.stdenv.mkDerivation rec {
"-Dlcms2fastfloat=disabled"
"-Dtools=enabled"
- #"-Dresvg=enabled"
] ++ pkgs.lib.optionals (!full) [
"-Dlcms2=disabled"
"-Dlibraw=disabled"
@@ -69,6 +70,8 @@ pkgs.stdenv.mkDerivation rec {
"-Dlibheif=disabled"
"-Dlibtiff=disabled"
"-Dgdk-pixbuf=disabled"
+ ] ++ pkgs.lib.optionals withResvg [
+ "-Dresvg=enabled"
];
preFixup = ''
diff --git a/sdn-master.nix b/sdn-master.nix
index 90300fd..7b43c55 100644
--- a/sdn-master.nix
+++ b/sdn-master.nix
@@ -13,6 +13,7 @@ pkgs.stdenv.mkDerivation rec {
buildInputs = with pkgs; [
ncurses
+ ] ++ lib.optionals stdenv.isLinux [
acl
];
@@ -31,7 +32,7 @@ pkgs.stdenv.mkDerivation rec {
meta = with pkgs.lib; {
description = "Directory navigator";
homepage = "https://git.janouch.name/p/${pname}";
- # libacl, __STDC_ISO_10646__
+ # libacl, __STDC_ISO_10646__, crash bug in libc++
platforms = platforms.linux;
license = licenses.bsd0;
};