From 6c62a2116194bd0356e744a25c0d62c152cc8ebe Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 26 May 2022 02:05:56 +0200 Subject: [PATCH] namecoin: remove GUI support --- pkgs/applications/blockchains/namecoin/default.nix | 9 ++------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 3 +-- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/blockchains/namecoin/default.nix b/pkgs/applications/blockchains/namecoin/default.nix index a9d6303e4852..4cf298c17859 100644 --- a/pkgs/applications/blockchains/namecoin/default.nix +++ b/pkgs/applications/blockchains/namecoin/default.nix @@ -1,8 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkg-config, qt4, protobuf, qrencode, hexdump -, withGui }: +{ lib, stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkg-config, hexdump }: stdenv.mkDerivation rec { - pname = "namecoin" + lib.optionalString (!withGui) "d"; + pname = "namecoind"; version = "25.0"; src = fetchFromGitHub { @@ -25,10 +24,6 @@ stdenv.mkDerivation rec { db4 miniupnpc eject - ] ++ lib.optionals withGui [ - qt4 - protobuf - qrencode ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9c48d4a2fede..10557d5d74ac 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1153,6 +1153,7 @@ mapAliases ({ ### N ### + namecoin = throw "namecoin GUI has been removed, because it depended on qt4"; # Added 2022-05-26 ncdu_2 = ncdu; # Added 2022-07-22 nccl = throw "nccl has been renamed to cudaPackages.nccl"; # Added 2022-04-04 nccl_cudatoolkit_10 = throw "nccl_cudatoolkit_10 has been renamed to cudaPackages_10.nccl"; # Added 2022-04-04 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ef4e31f9826..438f6cbbe268 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37383,8 +37383,7 @@ with pkgs; nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { }; - namecoin = callPackage ../applications/blockchains/namecoin { withGui = true; }; - namecoind = callPackage ../applications/blockchains/namecoin { withGui = false; }; + namecoind = callPackage ../applications/blockchains/namecoin { }; nbxplorer = callPackage ../applications/blockchains/nbxplorer { };