From 2dfffd1700e6c482ca1a4e23e85afdc4e12f9ea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 30 Apr 2022 02:31:15 +0200 Subject: [PATCH] namecoin: fix version parsing for nix-env, reduce with lib usage --- pkgs/applications/blockchains/namecoin/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/blockchains/namecoin/default.nix b/pkgs/applications/blockchains/namecoin/default.nix index d5c739e00f4a..e9b9d1044107 100644 --- a/pkgs/applications/blockchains/namecoin/default.nix +++ b/pkgs/applications/blockchains/namecoin/default.nix @@ -1,15 +1,14 @@ { lib, stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkg-config, qt4, protobuf, qrencode, hexdump , withGui }: -with lib; stdenv.mkDerivation rec { - pname = "namecoin" + optionalString (!withGui) "d"; - version = "nc22.0"; + pname = "namecoin" + lib.optionalString (!withGui) "d"; + version = "22.0"; src = fetchFromGitHub { owner = "namecoin"; repo = "namecoin-core"; - rev = version; + rev = "nc${version}"; sha256 = "sha256-Z3CLDe0c4IpFPPTie8yoh0kcuvGmiegSgl4ITNSDkgY="; }; @@ -26,7 +25,7 @@ stdenv.mkDerivation rec { db4 miniupnpc eject - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ qt4 protobuf qrencode @@ -38,7 +37,7 @@ stdenv.mkDerivation rec { "--with-boost-libdir=${boost.out}/lib" ]; - meta = { + meta = with lib; { description = "Decentralized open source information registration and transfer system based on the Bitcoin cryptocurrency"; homepage = "https://namecoin.org"; license = licenses.mit;