diff --git a/etc/nix/shell.nix b/etc/nix/shell.nix index 23c506b..3852571 100644 --- a/etc/nix/shell.nix +++ b/etc/nix/shell.nix @@ -136,10 +136,10 @@ let ; wownero-source = nixpkgs.fetchFromGitHub { - owner = "fuwa0529" + owner = "wownero" ; repo = "wownero" - ; rev = "8ca7e3" - ; sha256 = "07h8wiq8qm70m2s8bpalzx0fbrjl66khlha4qyfmpidpgv92daa6" + ; rev = "dev-v0.8" + ; sha256 = "13032pa9wx3h6x860f9iy28vdpkc94wzby153ig7hw4dixjqhs6w" ; } ; miniupnp-source = @@ -151,6 +151,15 @@ let ; sha256 = "1f7jgll8lxz2l5lifgqafgx8694x0svgwyz8w8w4cwavm9lmah63" ; } +; unbound-source = + nixpkgs.fetchFromGitHub + { + owner = "monero-project" + ; repo = "unbound" + ; rev = "9a77c29" + ; sha256 = "0dmm5pz2yf1lfand9k1c8x0mbrwynkpphh877b8jbavjrwiwsw35" + ; } + ; in with nixpkgs; @@ -216,6 +225,7 @@ with nixpkgs; export SRC_SODIUM=${sodium-source} export SRC_RANDOMWOW=${randomwow-source} export SRC_MINIUPNP_DIR=${miniupnp-source} + export SRC_UNBOUND_DIR=${unbound-source} export SRC_RAPIDJSON_DIR=${nixpkgs.rapidjson.src} export SRC_WOWNERO_DIR=${wownero-source} diff --git a/etc/scripts/build-external-libs/wownero/fetch.sh b/etc/scripts/build-external-libs/wownero/fetch.sh index cba3f01..f68b020 100755 --- a/etc/scripts/build-external-libs/wownero/fetch.sh +++ b/etc/scripts/build-external-libs/wownero/fetch.sh @@ -76,3 +76,10 @@ if [ -f $SRC_RANDOMWOW ]; then else git submodule update --init external/RandomWOW fi + +if [ -d $SRC_UNBOUND_DIR ]; then + echo "using pre-fetched unbound" + rsync -av --no-perms --no-owner --no-group --delete $SRC_UNBOUND_DIR/* external/unbound +else + git submodule update --init external/unbound +fi