From b32e8ce7d7ad3b9452e45fa09c6011cd028442ed Mon Sep 17 00:00:00 2001 From: Luke Adams Date: Wed, 12 Jul 2017 12:14:07 -0500 Subject: [PATCH] libosmocore: 0.9.0 -> 0.9.6 add new required talloc, python2 inputs; enableParallelBuilding --- .../applications/misc/libosmocore/default.nix | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/libosmocore/default.nix b/pkgs/applications/misc/libosmocore/default.nix index 47bcbb6fce9..17a13d7c49c 100644 --- a/pkgs/applications/misc/libosmocore/default.nix +++ b/pkgs/applications/misc/libosmocore/default.nix @@ -1,25 +1,31 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pcsclite, pkgconfig +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +, pcsclite, talloc, python2 }: stdenv.mkDerivation rec { name = "libosmocore-${version}"; - version = "0.9.0"; + version = "0.9.6"; src = fetchFromGitHub { owner = "osmocom"; repo = "libosmocore"; - rev = "8649d57f507d359c99a89654aac7e19ce22db282"; - sha256 = "08mcpy9ljwb1i3l4cmlwn024q2psk5gg9f0ylgh99hy1ffx0n7am"; + rev = "3cc757df1822114bf446dc2d5f6a95da92321a25"; + sha256 = "0dk7065qcy2kjra0p8q2124p73jcyvvzz3cmhid1kx5scyxmr017"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ - pcsclite + propagatedBuildInputs = [ + talloc ]; - preConfigure = '' - autoreconf -i -f - ''; + nativeBuildInputs = [ + autoreconfHook pkgconfig + ]; + + buildInputs = [ + pcsclite python2 + ]; + + enableParallelBuilding = true; meta = with stdenv.lib; { description = "libosmocore";