about summary refs log tree commit diff
diff options
context:
space:
mode:
authorThiago Kenji Okada <thiagokokada@gmail.com>2022-12-03 13:56:41 +0000
committerGitHub <noreply@github.com>2022-12-03 13:56:41 +0000
commit1a2415bb3258ec0c8b7bab3bf28b935542d889d2 (patch)
tree12e2edfc2946bcbfb489748a2d0d99faede07e87
parent1fc076154c790324e9b9cc87b53f4872bceb02e1 (diff)
parentf9104ee9735d54a34801a67a46d6fcbe64599b33 (diff)
downloadnixlib-1a2415bb3258ec0c8b7bab3bf28b935542d889d2.tar
nixlib-1a2415bb3258ec0c8b7bab3bf28b935542d889d2.tar.gz
nixlib-1a2415bb3258ec0c8b7bab3bf28b935542d889d2.tar.bz2
nixlib-1a2415bb3258ec0c8b7bab3bf28b935542d889d2.tar.lz
nixlib-1a2415bb3258ec0c8b7bab3bf28b935542d889d2.tar.xz
nixlib-1a2415bb3258ec0c8b7bab3bf28b935542d889d2.tar.zst
nixlib-1a2415bb3258ec0c8b7bab3bf28b935542d889d2.zip
Merge pull request #200053 from rodrgz/fuzzelnanosvg
fuzzel: librsvg -> nanosvg
-rw-r--r--maintainers/maintainer-list.nix6
-rw-r--r--pkgs/applications/misc/fuzzel/default.nix10
2 files changed, 10 insertions, 6 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 51fa21323a29..977233b7cf91 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -11976,6 +11976,12 @@
     githubId = 852967;
     name = "Russell O'Connor";
   };
+  rodrgz = {
+    email = "rodrgz@proton.me";
+    github = "rodrgz";
+    githubId = 53882428;
+    name = "Erik Rodriguez";
+  };
   roelvandijk = {
     email = "roel@lambdacube.nl";
     github = "roelvandijk";
diff --git a/pkgs/applications/misc/fuzzel/default.nix b/pkgs/applications/misc/fuzzel/default.nix
index 162b6362fd7d..76785c266a47 100644
--- a/pkgs/applications/misc/fuzzel/default.nix
+++ b/pkgs/applications/misc/fuzzel/default.nix
@@ -17,7 +17,6 @@
 , pngSupport ? true
 # Optional dependencies
 , cairo
-, librsvg
 , libpng
 }:
 
@@ -51,22 +50,21 @@ stdenv.mkDerivation rec {
     tllist
     fcft
   ] ++ lib.optional enableCairo cairo
-    ++ lib.optional pngSupport libpng
-    ++ lib.optional svgSupport librsvg;
+    ++ lib.optional pngSupport libpng;
 
   mesonBuildType = "release";
 
   mesonFlags = [
     "-Denable-cairo=${if enableCairo then "enabled" else "disabled"}"
     "-Dpng-backend=${if pngSupport then "libpng" else "none"}"
-    "-Dsvg-backend=${if svgSupport then "librsvg" else "none"}"
+    "-Dsvg-backend=${if svgSupport then "nanosvg" else "none"}"
   ];
 
   meta = with lib; {
     description = "Wayland-native application launcher, similar to rofi’s drun mode";
     homepage = "https://codeberg.org/dnkl/fuzzel";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fionera polykernel ];
+    license = with licenses; [ mit zlib ];
+    maintainers = with maintainers; [ fionera polykernel rodrgz ];
     platforms = with platforms; linux;
     changelog = "https://codeberg.org/dnkl/fuzzel/releases/tag/${version}";
   };