diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-10-18 02:51:58 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-10-18 03:15:23 +0300 |
| commit | 8f43c56755ecedc63b54a022057f1ff79dcbae89 (patch) | |
| tree | 9424618b3393f1b09dd7832252e7915ad6d87d46 /pkgs/development/libraries/libtorrent-rasterbar | |
| parent | 35ad024fa413dd13c8d43376e1959db51925d3e8 (diff) | |
| download | nixpkgs-8f43c56755ecedc63b54a022057f1ff79dcbae89.tar nixpkgs-8f43c56755ecedc63b54a022057f1ff79dcbae89.tar.gz nixpkgs-8f43c56755ecedc63b54a022057f1ff79dcbae89.tar.bz2 nixpkgs-8f43c56755ecedc63b54a022057f1ff79dcbae89.tar.lz nixpkgs-8f43c56755ecedc63b54a022057f1ff79dcbae89.tar.xz nixpkgs-8f43c56755ecedc63b54a022057f1ff79dcbae89.tar.zst nixpkgs-8f43c56755ecedc63b54a022057f1ff79dcbae89.zip | |
libtorrentRasterbar: 1.1.4 -> 1.1.5
Fixes build with new Boost. Also add corresponding patch to libtorrentRasterbar_1_0.
Diffstat (limited to 'pkgs/development/libraries/libtorrent-rasterbar')
3 files changed, 20 insertions, 11 deletions
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix index 877d8ed434c..fbd30ac04f7 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix @@ -1,6 +1,13 @@ -{ callPackage, ... } @ args: +args@{ callPackage, fetchpatch, ... }: -callPackage ./generic.nix (args // { +callPackage (import ./generic.nix { version = "1.0.11"; sha256 = "17p34d3n29q04pvz975gfl1fyj3sg9cl5l6j673xqfq3fpyis58i"; -}) + patches = [ + # Compatibility with new Boost + (fetchpatch { + url = "https://github.com/arvidn/libtorrent/commit/7eb3cf6bc6dbada3fa7bb7ff4d5981182813a0e2.patch"; + sha256 = "07agbrii6i8q4wmgpqbln7ldhhadaf5npcinvi6hnyipsr48jbj5"; + }) + ]; +}) args diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index ed52902938d..ff5027fd472 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -1,6 +1,6 @@ -{ callPackage, ... } @ args: +args@{ callPackage, ... }: -callPackage ./generic.nix (args // { - version = "1.1.4"; - sha256 = "1rrp4b7zfz0fnjvax2r9r5rrh6z1s4xqb9dx20gzr4gs8x5v5jws"; -}) +callPackage (import ./generic.nix { + version = "1.1.5"; + sha256 = "1ifpcqw5mj2dwk23lhc2vpb47mg3j573v5z4zp8dkczpz7wg5jxq"; +}) args diff --git a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix index 351ec3e7733..315385cba6c 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, automake, autoconf, boost, openssl, lib, libtool, pkgconfig, zlib, python, libiconv, geoip # Version specific options -, version, sha256 -, ... }: +{ version, sha256, patches ? [] }: + +{ stdenv, fetchurl, automake, autoconf, boost, openssl, lib, libtool, pkgconfig, zlib, python, libiconv, geoip, ... }: let formattedVersion = lib.replaceChars ["."] ["_"] version; @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { inherit sha256; }; + inherit patches; + nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; buildInputs = [ boost openssl zlib python libiconv geoip ]; |