Add resvg toggle to fiv, slightly adjust sdn

This commit is contained in:
Přemysl Eric Janouch 2023-06-30 02:33:55 +02:00
parent 0444cbcddf
commit 76727f875f
Signed by: p
GPG Key ID: A0420B94F92B9493
2 changed files with 7 additions and 3 deletions

View File

@ -1,6 +1,7 @@
{ pkgs ? import <nixpkgs> { } { pkgs ? import <nixpkgs> { }
, local ? false , local ? false
, full ? true , full ? true
, withResvg ? false
}: }:
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation rec {
pname = "fiv"; pname = "fiv";
@ -27,9 +28,10 @@ pkgs.stdenv.mkDerivation rec {
libepoxy libepoxy
] ++ lib.optionals full [ ] ++ lib.optionals full [
lcms2 lcms2
#resvg
librsvg librsvg
libheif libheif
] ++ lib.optionals withResvg [
resvg
]; ];
src = if local then src = if local then
@ -59,7 +61,6 @@ pkgs.stdenv.mkDerivation rec {
"-Dlcms2fastfloat=disabled" "-Dlcms2fastfloat=disabled"
"-Dtools=enabled" "-Dtools=enabled"
#"-Dresvg=enabled"
] ++ pkgs.lib.optionals (!full) [ ] ++ pkgs.lib.optionals (!full) [
"-Dlcms2=disabled" "-Dlcms2=disabled"
"-Dlibraw=disabled" "-Dlibraw=disabled"
@ -69,6 +70,8 @@ pkgs.stdenv.mkDerivation rec {
"-Dlibheif=disabled" "-Dlibheif=disabled"
"-Dlibtiff=disabled" "-Dlibtiff=disabled"
"-Dgdk-pixbuf=disabled" "-Dgdk-pixbuf=disabled"
] ++ pkgs.lib.optionals withResvg [
"-Dresvg=enabled"
]; ];
preFixup = '' preFixup = ''

View File

@ -13,6 +13,7 @@ pkgs.stdenv.mkDerivation rec {
buildInputs = with pkgs; [ buildInputs = with pkgs; [
ncurses ncurses
] ++ lib.optionals stdenv.isLinux [
acl acl
]; ];
@ -31,7 +32,7 @@ pkgs.stdenv.mkDerivation rec {
meta = with pkgs.lib; { meta = with pkgs.lib; {
description = "Directory navigator"; description = "Directory navigator";
homepage = "https://git.janouch.name/p/${pname}"; homepage = "https://git.janouch.name/p/${pname}";
# libacl, __STDC_ISO_10646__ # libacl, __STDC_ISO_10646__, crash bug in libc++
platforms = platforms.linux; platforms = platforms.linux;
license = licenses.bsd0; license = licenses.bsd0;
}; };