From 41fe9b0c1dfbee8cc304a0ba923c3dcb2b4c53a0 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Mon, 1 Feb 2021 22:53:02 +0100
Subject: [PATCH] elementsd: minor refactoring

- Use pname
- urls -> url
---
 pkgs/elementsd/default.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/elementsd/default.nix b/pkgs/elementsd/default.nix
index 1b9ae92..a46a1a3 100644
--- a/pkgs/elementsd/default.nix
+++ b/pkgs/elementsd/default.nix
@@ -3,20 +3,20 @@
 , withGui }:
 
 with stdenv.lib;
-stdenv.mkDerivation rec{
-  name = "elements" + (toString (optional (!withGui) "d")) + "-" + version;
+stdenv.mkDerivation rec {
+  pname = "elements${optionalString (!withGui) "d"}";
   version = "0.18.1.9";
 
   src = fetchurl {
-    urls = [
-            "https://github.com/ElementsProject/elements/archive/elements-${version}.tar.gz"
-           ];
+    url = "https://github.com/ElementsProject/elements/archive/elements-${version}.tar.gz";
+    # Use ./get-sha256.sh to fetch latest (verified) sha256
     sha256 = "c6f1b040a896a1aaa7340f5cd48e119c84fef88df5d4c17d5ad5c13783f5b6c7";
-   };
+  };
 
   nativeBuildInputs =
     [ pkgconfig autoreconfHook ]
     ++ optional withGui wrapQtAppsHook;
+
   buildInputs = [ openssl db48 boost zlib zeromq
                   miniupnpc protobuf libevent]
                   ++ optionals stdenv.isLinux [ utillinux ]
@@ -27,10 +27,10 @@ stdenv.mkDerivation rec{
                    ] ++ optionals (!doCheck) [
                      "--disable-tests"
                      "--disable-gui-tests"
-                   ]
-                     ++ optionals withGui [ "--with-gui=qt5"
-                                            "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
-                                          ];
+                   ] ++ optionals withGui [
+                     "--with-gui=qt5"
+                     "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
+                   ];
 
   checkInputs = [ rapidcheck python3 ];