diff options
| author | Jaakko Luttinen <jaakko.luttinen@iki.fi> | 2020-03-27 10:33:05 +0200 |
|---|---|---|
| committer | Jaakko Luttinen <jaakko.luttinen@iki.fi> | 2020-03-28 12:49:50 +0200 |
| commit | 86a012b9609b8c3b4035697b61a8ca4a1d16b01a (patch) | |
| tree | ece355446d79d60f9066e745bf3d71a060791270 | |
| parent | 70e538893cea901ed40045fd31a7033f75ffdb4d (diff) | |
| download | nixpkgs-86a012b9609b8c3b4035697b61a8ca4a1d16b01a.tar nixpkgs-86a012b9609b8c3b4035697b61a8ca4a1d16b01a.tar.gz nixpkgs-86a012b9609b8c3b4035697b61a8ca4a1d16b01a.tar.bz2 nixpkgs-86a012b9609b8c3b4035697b61a8ca4a1d16b01a.tar.lz nixpkgs-86a012b9609b8c3b4035697b61a8ca4a1d16b01a.tar.xz nixpkgs-86a012b9609b8c3b4035697b61a8ca4a1d16b01a.tar.zst nixpkgs-86a012b9609b8c3b4035697b61a8ca4a1d16b01a.zip | |
trx: 0.4 -> 0.5
| -rw-r--r-- | pkgs/tools/audio/trx/add_bctoolbox_ldlib.patch | 15 | ||||
| -rw-r--r-- | pkgs/tools/audio/trx/default.nix | 10 |
2 files changed, 23 insertions, 2 deletions
diff --git a/pkgs/tools/audio/trx/add_bctoolbox_ldlib.patch b/pkgs/tools/audio/trx/add_bctoolbox_ldlib.patch new file mode 100644 index 00000000000..1854a43a249 --- /dev/null +++ b/pkgs/tools/audio/trx/add_bctoolbox_ldlib.patch @@ -0,0 +1,15 @@ +diff --git a/Makefile b/Makefile +index ffcd883..c4b4ff7 100644 +--- a/Makefile ++++ b/Makefile +@@ -12,8 +12,9 @@ CFLAGS += -MMD -Wall + LDLIBS_ASOUND ?= -lasound + LDLIBS_OPUS ?= -lopus + LDLIBS_ORTP ?= -lortp ++LDLIBS_BCTOOLBOX ?= -lbctoolbox + +-LDLIBS += $(LDLIBS_ASOUND) $(LDLIBS_OPUS) $(LDLIBS_ORTP) ++LDLIBS += $(LDLIBS_ASOUND) $(LDLIBS_OPUS) $(LDLIBS_ORTP) $(LDLIBS_BCTOOLBOX) + + .PHONY: all install dist clean + diff --git a/pkgs/tools/audio/trx/default.nix b/pkgs/tools/audio/trx/default.nix index 1d052adbba9..224c331b961 100644 --- a/pkgs/tools/audio/trx/default.nix +++ b/pkgs/tools/audio/trx/default.nix @@ -2,13 +2,19 @@ stdenv.mkDerivation rec { pname = "trx"; - version = "0.4"; + version = "0.5"; src = fetchurl { url = "https://www.pogo.org.uk/~mark/trx/releases/${pname}-${version}.tar.gz"; - sha256 = "1wsrkbqc090px8i9p8awz38znxjcqjb1dzjjdd8xkjmiprayjhkl"; + sha256 = "1jjgca92nifjhcr3n0fmpfr6f5gxlqyal2wmgdlgd7hx834r1if7"; }; + # Makefile is currently missing -lbctoolbox so the build fails when linking + # the libraries. This patch adds that flag. + patches = [ + ./add_bctoolbox_ldlib.patch + ]; + buildInputs = [ alsaLib libopus ortp bctoolbox ]; makeFlags = [ "PREFIX=$(out)" ]; |