From 9735d32e8bcbcd17f67ac8d4232069d4fd946015 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 2 May 2023 21:57:49 -0300 Subject: [PATCH] cimg: cosmetic changes - use rec-less, finalAttrs-style attributes - remove nested `with` from meta attributes --- pkgs/development/libraries/cimg/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 6d8278425b0..b48986f9ce5 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -5,14 +5,14 @@ , gmic-qt }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cimg"; version = "3.2.4"; src = fetchFromGitHub { owner = "GreycLab"; repo = "CImg"; - rev = "v.${version}"; + rev = "v.${finalAttrs.version}"; hash = "sha256-CQYY5aKRDe6F7GrBJfqt0t/rjjdZnr/c/cqhr6yVACA="; }; @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { ''; passthru.tests = { - # Need to update in lockstep. + # Needs to update them all in lockstep. inherit gmic gmic-qt; }; - meta = with lib; { + meta = { homepage = "http://cimg.eu/"; description = "A small, open source, C++ toolkit for image processing"; longDescription = '' @@ -44,8 +44,11 @@ stdenv.mkDerivation rec { C++. Due to its generic conception, it can cover a wide range of image processing applications. ''; - license = licenses.cecill-c; - maintainers = [ maintainers.AndersonTorres maintainers.lilyinstarlight ]; - platforms = platforms.unix; + license = lib.licenses.cecill-c; + maintainers = [ + lib.maintainers.AndersonTorres + lib.maintainers.lilyinstarlight + ]; + platforms = lib.platforms.unix; }; -} +})