From 08e87f1a6c963ed693b6d519173b8cf3dbfa498a Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Fri, 22 Sep 2023 11:53:30 +0300 Subject: [PATCH] identity: refactor --- .../graphics/identity/default.nix | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/graphics/identity/default.nix b/pkgs/applications/graphics/identity/default.nix index ab2e3426624b..fcdf7c56dc35 100644 --- a/pkgs/applications/graphics/identity/default.nix +++ b/pkgs/applications/graphics/identity/default.nix @@ -1,20 +1,22 @@ -{ appstream-glib -, blueprint-compiler -, desktop-file-utils +{ lib +, stdenv , fetchFromGitLab -, gst_all_1 -, gtk4 -, lib -, libadwaita +, rustPlatform +, nix-update-script + +, appstream-glib +, blueprint-compiler , cargo +, desktop-file-utils , meson , ninja -, nix-update-script , pkg-config -, rustPlatform , rustc -, stdenv , wrapGAppsHook4 + +, gst_all_1 +, gtk4 +, libadwaita }: stdenv.mkDerivation rec { @@ -26,7 +28,7 @@ stdenv.mkDerivation rec { owner = "YaLTeR"; repo = "identity"; rev = "v${version}"; - sha256 = "sha256-ZBK2Vc2wnohABnWXRtmRdAAOnkTIHt4RriZitu8BW1A="; + hash = "sha256-ZBK2Vc2wnohABnWXRtmRdAAOnkTIHt4RriZitu8BW1A="; }; cargoDeps = rustPlatform.fetchCargoTarball { @@ -38,14 +40,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ appstream-glib blueprint-compiler + cargo desktop-file-utils meson ninja pkg-config - wrapGAppsHook4 - rustPlatform.cargoSetupHook - cargo rustc + rustPlatform.cargoSetupHook + wrapGAppsHook4 ]; buildInputs = [ @@ -60,11 +62,11 @@ stdenv.mkDerivation rec { passthru.updateScript = nix-update-script { }; - meta = { + meta = with lib; { description = "A program for comparing multiple versions of an image or video"; homepage = "https://gitlab.gnome.org/YaLTeR/identity"; - maintainers = [ lib.maintainers.paveloom ]; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ paveloom ]; }; }