From 253a0637876f2115d534869a083dea1accabb7ee Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 16 Aug 2023 17:11:08 +0200 Subject: [PATCH] xdg-dbus-proxy: use `finalAttrs` pattern --- .../libraries/xdg-dbus-proxy/default.nix | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/xdg-dbus-proxy/default.nix b/pkgs/development/libraries/xdg-dbus-proxy/default.nix index 32eaf135d28..845a8fcfdc4 100644 --- a/pkgs/development/libraries/xdg-dbus-proxy/default.nix +++ b/pkgs/development/libraries/xdg-dbus-proxy/default.nix @@ -1,32 +1,32 @@ -{ stdenv -, lib +{ dbus +, docbook-xsl-nons +, docbook_xml_dtd_43 , fetchurl +, glib +, lib +, libxslt , meson , ninja , pkg-config -, libxslt -, docbook-xsl-nons -, docbook_xml_dtd_43 -, dbus -, glib +, stdenv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xdg-dbus-proxy"; version = "0.1.5"; src = fetchurl { - url = "https://github.com/flatpak/xdg-dbus-proxy/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Bh3Pr4oGUOX9nVQy3+iL2nSeoNB53BNjBL/s+84GYfs="; + url = "https://github.com/flatpak/xdg-dbus-proxy/releases/download/${finalAttrs.version}/xdg-dbus-proxy-${finalAttrs.version}.tar.xz"; + hash = "sha256-Bh3Pr4oGUOX9nVQy3+iL2nSeoNB53BNjBL/s+84GYfs="; }; nativeBuildInputs = [ + docbook-xsl-nons + docbook_xml_dtd_43 + libxslt meson ninja pkg-config - libxslt - docbook-xsl-nons - docbook_xml_dtd_43 ]; buildInputs = [ @@ -40,12 +40,12 @@ stdenv.mkDerivation rec { # dbus[2345]: Failed to start message bus: Failed to open "/etc/dbus-1/session.conf": No such file or directory doCheck = false; - meta = with lib; { + meta = { description = "DBus proxy for Flatpak and others"; homepage = "https://github.com/flatpak/xdg-dbus-proxy"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.linux; + license = lib.licenses.lgpl21Plus; mainProgram = "xdg-dbus-proxy"; + maintainers = with lib.maintainers; [ jtojnar ]; + platforms = lib.platforms.linux; }; -} +})