nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-02 15:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

libtorrentRasterbar: 1.1.4 -> 1.1.5

Browse Source 
Fixes build with new Boost. Also add corresponding patch to
libtorrentRasterbar_1_0.
This commit is contained in:
Nikolay Amiantov 2017-10-18 02:51:58 +03:00
parent 35ad024fa4
commit 8f43c56755
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/libtorrent-rasterbar/1.0.nix
View File

@ -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

10
pkgs/development/libraries/libtorrent-rasterbar/default.nix
View File

@ -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

8
pkgs/development/libraries/libtorrent-rasterbar/generic.nix
View File

@ -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 ];