Merge pull request #191734 from viraptor/liquid-dsp-fix-darwin

liquid-dsp: fix darwin build

authored by Robert Scott and committed by GitHub 6a9da90b 140d2135

+9 -4
+8 -3
pkgs/development/libraries/liquid-dsp/default.nix
··· 1 - {lib, stdenv, fetchFromGitHub, autoreconfHook }: 2 3 stdenv.mkDerivation rec { 4 pname = "liquid-dsp"; ··· 11 sha256 = "0mr86z37yycrqwbrmsiayi1vqrgpjq0pn1c3p1qrngipkw45jnn0"; 12 }; 13 14 - nativeBuildInputs = [ autoreconfHook ]; 15 16 meta = { 17 - broken = stdenv.isDarwin; 18 homepage = "https://liquidsdr.org/"; 19 description = "Digital signal processing library for software-defined radios"; 20 license = lib.licenses.mit;
··· 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , autoreconfHook 5 + , cctools 6 + }: 7 8 stdenv.mkDerivation rec { 9 pname = "liquid-dsp"; ··· 16 sha256 = "0mr86z37yycrqwbrmsiayi1vqrgpjq0pn1c3p1qrngipkw45jnn0"; 17 }; 18 19 + configureFlags = lib.optionals stdenv.isDarwin [ "LIBTOOL=${cctools}/bin/libtool" ]; 20 + nativeBuildInputs = [ autoreconfHook ] ++ lib.optionals stdenv.isDarwin [ cctools ]; 21 22 meta = { 23 homepage = "https://liquidsdr.org/"; 24 description = "Digital signal processing library for software-defined radios"; 25 license = lib.licenses.mit;
+1 -1
pkgs/top-level/all-packages.nix
··· 20598 20599 lirc = callPackage ../development/libraries/lirc { }; 20600 20601 - liquid-dsp = callPackage ../development/libraries/liquid-dsp { }; 20602 20603 liquidfun = callPackage ../development/libraries/liquidfun { }; 20604
··· 20598 20599 lirc = callPackage ../development/libraries/lirc { }; 20600 20601 + liquid-dsp = callPackage ../development/libraries/liquid-dsp { inherit (darwin) cctools; }; 20602 20603 liquidfun = callPackage ../development/libraries/liquidfun { }; 20604