groestlcoin: migrate to by-name
This commit is contained in:
+9
-10
@@ -6,8 +6,7 @@
|
||||
cmake,
|
||||
pkg-config,
|
||||
installShellFiles,
|
||||
autoSignDarwinBinariesHook,
|
||||
wrapQtAppsHook ? null,
|
||||
darwin,
|
||||
boost,
|
||||
libevent,
|
||||
zeromq,
|
||||
@@ -16,11 +15,10 @@
|
||||
sqlite,
|
||||
qrencode,
|
||||
libsystemtap,
|
||||
qtbase ? null,
|
||||
qttools ? null,
|
||||
qt5,
|
||||
python3,
|
||||
versionCheckHook,
|
||||
withGui ? false,
|
||||
withGui ? true,
|
||||
withWallet ? true,
|
||||
}:
|
||||
|
||||
@@ -48,9 +46,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
installShellFiles
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
|
||||
autoSignDarwinBinariesHook
|
||||
darwin.autoSignDarwinBinariesHook
|
||||
]
|
||||
++ lib.optionals withGui [ wrapQtAppsHook ];
|
||||
++ lib.optionals withGui [ qt5.wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
@@ -65,8 +63,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
]
|
||||
++ lib.optionals withGui [
|
||||
qrencode
|
||||
qtbase
|
||||
qttools
|
||||
qt5.qtbase
|
||||
qt5.qttools
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
@@ -97,6 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
]
|
||||
++ lib.optionals withGui [
|
||||
(lib.cmakeBool "BUILD_GUI" true)
|
||||
(lib.cmakeBool "WITH_QRENCODE" true) # Fixes the headless QR encode crash!
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ python3 ];
|
||||
@@ -106,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
]
|
||||
# QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Groestlcoin's GUI.
|
||||
# See also https://github.com/NixOS/nixpkgs/issues/24256
|
||||
++ lib.optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}";
|
||||
++ lib.optional withGui "QT_PLUGIN_PATH=${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -10459,13 +10459,8 @@ with pkgs;
|
||||
|
||||
gridcoin-researchd = gridcoin-research.override { withGui = false; };
|
||||
|
||||
groestlcoin = libsForQt5.callPackage ../applications/blockchains/groestlcoin {
|
||||
withGui = true;
|
||||
inherit (darwin) autoSignDarwinBinariesHook;
|
||||
};
|
||||
|
||||
groestlcoind = callPackage ../applications/blockchains/groestlcoin {
|
||||
inherit (darwin) autoSignDarwinBinariesHook;
|
||||
groestlcoind = groestlcoin.override {
|
||||
withGui = false;
|
||||
};
|
||||
|
||||
ledger-agent = with python3Packages; toPythonApplication ledger-agent;
|
||||
|
||||
Reference in New Issue
Block a user