about summary refs log tree commit diff
diff options
context:
space:
mode:
authorjanus <janus@xn--kn-1ia.guru>2015-11-24 11:37:39 +0000
committerjanus <janus@xn--kn-1ia.guru>2016-01-01 16:59:48 +0000
commit3cb831d2bcb6d534325178c6928bc893a14534f8 (patch)
tree348229c03152c1935a793e6c33971509b2ba8baa
parenta1ade02cdc75a11013c49ad12c7bb4feeec0d080 (diff)
downloadnixlib-3cb831d2bcb6d534325178c6928bc893a14534f8.tar
nixlib-3cb831d2bcb6d534325178c6928bc893a14534f8.tar.gz
nixlib-3cb831d2bcb6d534325178c6928bc893a14534f8.tar.bz2
nixlib-3cb831d2bcb6d534325178c6928bc893a14534f8.tar.lz
nixlib-3cb831d2bcb6d534325178c6928bc893a14534f8.tar.xz
nixlib-3cb831d2bcb6d534325178c6928bc893a14534f8.tar.zst
nixlib-3cb831d2bcb6d534325178c6928bc893a14534f8.zip
FreeBSD patches for miniupnpc, boost, bitcoin
-rw-r--r--pkgs/applications/altcoins/bitcoin.nix2
-rw-r--r--pkgs/development/libraries/boost/generic.nix2
-rw-r--r--pkgs/tools/networking/miniupnpc/default.nix13
3 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix
index fb2827c4bd3e..91432f2f5a8a 100644
--- a/pkgs/applications/altcoins/bitcoin.nix
+++ b/pkgs/applications/altcoins/bitcoin.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost
-, zlib, miniupnpc, qt4, protobuf, qrencode
+, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode
 , withGui }:
 
 with stdenv.lib;
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 2a83d7c4142d..5b497aa76b84 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -1,5 +1,5 @@
 { stdenv, icu, expat, zlib, bzip2, python, fixDarwinDylibNames
-, toolset ? if stdenv.isDarwin then "clang" else null
+, toolset ? if stdenv.isDarwin || stdenv.isFreeBSD then "clang" else null
 , enableRelease ? true
 , enableDebug ? false
 , enableSingleThreaded ? false
diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix
index ba0f6c255212..ac68b55ad17f 100644
--- a/pkgs/tools/networking/miniupnpc/default.nix
+++ b/pkgs/tools/networking/miniupnpc/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub }:
 
-let version = "1.9.20150430"; in
+let version = "24d54ba13af4e53aba19c23898a373feecb41bd0"; in
 stdenv.mkDerivation rec {
   name = "miniupnpc-${version}";
 
-  src = fetchurl {
-    url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
-    sha256 = "0ivnvzla0l2pzmy8s0j8ss0fnpsii7z9scvyl4a13g9k911hgmvn";
-    name = "${name}.tar.gz";
+  src = fetchFromGitHub {
+    owner = "miniupnp";
+    repo = "miniupnp";
+    sha256 = "0j78dvlfh1a3a27zhvv001cb1d7vcgyv33bd1zr36drg64b6hrgw";
+    rev = version;
   };
 
   doCheck = true;