about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Justin Bauer <mjbauer95@gmail.com>2018-06-22 20:26:42 -0400
committerGitHub <noreply@github.com>2018-06-22 20:26:42 -0400
commit9c0ebbe7a36d7296e81d97c85cba35aee7bd8334 (patch)
treed946126d12043578fba64dd547ba12c1ca7a189e
parenta006243b8d873292868d323054792d9361175cd9 (diff)
parentdfa078951fb505cf78f8bf3503c130685a17b8c2 (diff)
downloadnixlib-9c0ebbe7a36d7296e81d97c85cba35aee7bd8334.tar
nixlib-9c0ebbe7a36d7296e81d97c85cba35aee7bd8334.tar.gz
nixlib-9c0ebbe7a36d7296e81d97c85cba35aee7bd8334.tar.bz2
nixlib-9c0ebbe7a36d7296e81d97c85cba35aee7bd8334.tar.lz
nixlib-9c0ebbe7a36d7296e81d97c85cba35aee7bd8334.tar.xz
nixlib-9c0ebbe7a36d7296e81d97c85cba35aee7bd8334.tar.zst
nixlib-9c0ebbe7a36d7296e81d97c85cba35aee7bd8334.zip
Merge pull request #42405 from worldofpeace/patch-3
libtorrentRasterbar: fix build with boost167
-rw-r--r--pkgs/development/libraries/libtorrent-rasterbar/default.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index 335400b80efc..5323b757b2bc 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, automake, autoconf, boost, openssl, lib, libtool, pkgconfig, zlib, python, libiconv, geoip, ... }:
+{ stdenv, fetchurl, fetchpatch, automake, autoconf, boost, openssl, lib, libtool, pkgconfig, zlib, python, libiconv, geoip, ... }:
 
 stdenv.mkDerivation rec {
   name = "libtorrent-rasterbar-${version}";
@@ -11,6 +11,13 @@ stdenv.mkDerivation rec {
       sha256 = "0vbw7wcw8x9787rq5fwaibpvvspm3237l8ahbf20gjpzxhn4yfwc";
     };
 
+patches = [
+  (fetchpatch {
+    url = "https://github.com/arvidn/libtorrent/commit/64d6b4900448097b0157abb328621dd211e2947d.patch";
+    sha256 = "0d4h0g129rsgm8xikybxypgv6nnya7ap7kskl7q78p4h6y2a0fhc";
+  })
+];
+
   nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
   buildInputs = [ boost openssl zlib python libiconv geoip ];