From b6a2280681d2131b742d83381c067b48ca1e37e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Sun, 18 Sep 2022 14:14:57 +1000 Subject: [PATCH] liquid-dsp: fix darwin build --- pkgs/development/libraries/liquid-dsp/default.nix | 11 ++++++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/development/libraries/liquid-dsp/default.nix index a40882490177..144a215acb45 100644 --- a/pkgs/development/libraries/liquid-dsp/default.nix +++ b/pkgs/development/libraries/liquid-dsp/default.nix @@ -1,4 +1,9 @@ -{lib, stdenv, fetchFromGitHub, autoreconfHook }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, cctools +}: stdenv.mkDerivation rec { pname = "liquid-dsp"; @@ -11,10 +16,10 @@ stdenv.mkDerivation rec { sha256 = "0mr86z37yycrqwbrmsiayi1vqrgpjq0pn1c3p1qrngipkw45jnn0"; }; - nativeBuildInputs = [ autoreconfHook ]; + configureFlags = lib.optionals stdenv.isDarwin [ "LIBTOOL=${cctools}/bin/libtool" ]; + nativeBuildInputs = [ autoreconfHook ] ++ lib.optionals stdenv.isDarwin [ cctools ]; meta = { - broken = stdenv.isDarwin; homepage = "https://liquidsdr.org/"; description = "Digital signal processing library for software-defined radios"; license = lib.licenses.mit; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3a73b98a6b17..be7713e1b2c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20546,7 +20546,7 @@ with pkgs; lirc = callPackage ../development/libraries/lirc { }; - liquid-dsp = callPackage ../development/libraries/liquid-dsp { }; + liquid-dsp = callPackage ../development/libraries/liquid-dsp { inherit (darwin) cctools; }; liquidfun = callPackage ../development/libraries/liquidfun { };