Fix guix build.

particl · Jan 3, 2024 · 498977c · 498977c
1 parent 85a6ab8
commit 498977c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 15 deletions.
diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm
@@ -10,7 +10,7 @@
              (gnu packages file)
              (gnu packages gawk)
              (gnu packages gcc)
-             ((gnu packages installers) #:select (nsis-x86_64))
+             ((gnu packages installers) #:select (nsis-x86_64 nsis-i686))
              ((gnu packages linux) #:select (linux-libre-headers-5.15 util-linux))
              (gnu packages llvm)
              (gnu packages mingw)
@@ -606,7 +606,7 @@ inspecting signatures in Mach-O binaries.")
            ;; Windows
            (list zip
                  (make-mingw-pthreads-cross-toolchain "i686-w64-mingw32")
-                 (make-nsis-for-gcc-10 nsis-i686)
+                 nsis-i686
                  nss-certs
                  osslsigncode))
           ((string-contains target "-linux-")

diff --git a/src/anon.cpp b/src/anon.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2023 The Particl Core developers
+// Copyright (c) 2017-2024 The Particl Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file license.txt or http://www.opensource.org/licenses/mit-license.php.
 
@@ -22,6 +22,7 @@
 #include <node/blockstorage.h>
 #include <common/args.h>
 #include <util/strencodings.h>
+#include <logging.h>
 
 
 bool CheckAnonInputMempoolConflicts(const CTxIn &txin, const uint256 txhash, CTxMemPool *pmempool, TxValidationState &state)

diff --git a/src/consensus/tx_verify.cpp b/src/consensus/tx_verify.cpp
@@ -20,13 +20,14 @@
 
 // Particl dependencies
 #include <blind.h>
-#include <insight/balanceindex.h>
-#include <validation.h>
-#include <consensus/params.h>
 #include <chainparams.h>
-#include <timedata.h>
+#include <consensus/params.h>
 #include <common/args.h>
+#include <insight/balanceindex.h>
+#include <logging.h>
+#include <timedata.h>
 #include <util/strencodings.h>
+#include <validation.h>
 
 
 bool IsFinalTx(const CTransaction &tx, int nBlockHeight, int64_t nBlockTime)

diff --git a/src/pos/kernel.cpp b/src/pos/kernel.cpp
@@ -1,25 +1,27 @@
 // Copyright (c) 2012-2013 The PPCoin developers
 // Copyright (c) 2014 The BlackCoin developers
-// Copyright (c) 2017-2023 The Particl Core developers
+// Copyright (c) 2017-2024 The Particl Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <pos/kernel.h>
 
 #include <chainparams.h>
-#include <serialize.h>
-#include <streams.h>
-#include <hash.h>
-#include <script/interpreter.h>
-#include <script/script.h>
-#include <policy/policy.h>
 #include <consensus/validation.h>
 #include <coins.h>
+#include <hash.h>
 #include <insight/insight.h>
-#include <txmempool.h>
+#include <logging.h>
 #include <node/transaction.h>
+#include <policy/policy.h>
+#include <script/interpreter.h>
+#include <script/script.h>
+#include <serialize.h>
+#include <streams.h>
+#include <txmempool.h>
 #include <validation.h>
 
+
 /* Calculate the difficulty for a given block index.
  * Duplicated from rpc/blockchain.cpp for linking
  */