From bfcf770d35ceceb4d6332eab66e794cd5ddaf289 Mon Sep 17 00:00:00 2001 From: Yifei Sun Date: Mon, 6 Jan 2025 13:40:50 -0500 Subject: [PATCH] libfm: use `finalAttrs` pattern and remove `with lib;` --- pkgs/by-name/li/libfm/package.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/li/libfm/package.nix b/pkgs/by-name/li/libfm/package.nix index d762036a22d074..76ae30dfd9ae76 100644 --- a/pkgs/by-name/li/libfm/package.nix +++ b/pkgs/by-name/li/libfm/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, glib, intltool, menu-cache, @@ -18,12 +19,12 @@ let gtk = if withGtk3 then gtk3 else gtk2; inherit (lib) optional optionalString; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = if extraOnly then "libfm-extra" else "libfm"; version = "1.3.2"; src = fetchurl { - url = "mirror://sourceforge/pcmanfm/libfm-${version}.tar.xz"; + url = "mirror://sourceforge/pcmanfm/libfm-${finalAttrs.version}.tar.xz"; sha256 = "sha256-pQQmMDBM+OXYz/nVZca9VG8ii0jJYBU+02ajTofK0eU="; }; @@ -59,12 +60,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + meta = { broken = stdenv.hostPlatform.isDarwin; homepage = "https://blog.lxde.org/category/pcmanfm/"; - license = licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; description = "Glib-based library for file management"; - maintainers = [ maintainers.ttuegel ]; - platforms = platforms.linux ++ platforms.darwin; + maintainers = with lib.maintainers; [ ttuegel ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +})