diff options
| author | Marek Mahut <marek.mahut@gmail.com> | 2019-10-31 10:29:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-31 10:29:19 +0100 |
| commit | 1d9e1d4f2dcf67e47938329cf4a060d566a3ce5f (patch) | |
| tree | 06e3fc2e555a791a29483ab46cc3cc994776cdf2 /pkgs | |
| parent | c91a1be87720fe33d09aec6007e5e3cab4c07783 (diff) | |
| parent | b6122418edd6561e0add900e6e238877b6712d6e (diff) | |
| download | nixpkgs-1d9e1d4f2dcf67e47938329cf4a060d566a3ce5f.tar nixpkgs-1d9e1d4f2dcf67e47938329cf4a060d566a3ce5f.tar.gz nixpkgs-1d9e1d4f2dcf67e47938329cf4a060d566a3ce5f.tar.bz2 nixpkgs-1d9e1d4f2dcf67e47938329cf4a060d566a3ce5f.tar.lz nixpkgs-1d9e1d4f2dcf67e47938329cf4a060d566a3ce5f.tar.xz nixpkgs-1d9e1d4f2dcf67e47938329cf4a060d566a3ce5f.tar.zst nixpkgs-1d9e1d4f2dcf67e47938329cf4a060d566a3ce5f.zip | |
Merge pull request #72355 from markuskowa/upd-welle
welle-io: 1.0 -> 2.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/radio/welle-io/default.nix | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/applications/radio/welle-io/default.nix index c6b09595c20..229200f2352 100644 --- a/pkgs/applications/radio/welle-io/default.nix +++ b/pkgs/applications/radio/welle-io/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig +{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig , qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2 -, faad2, rtl-sdr, soapysdr-with-plugins, libusb, fftwSinglePrec }: +, faad2, rtl-sdr, soapysdr-with-plugins, libusb, fftwSinglePrec, lame, mpg123 }: let - version = "1.0"; + version = "2.0"; -in stdenv.mkDerivation { +in mkDerivation { pname = "welle-io"; inherit version; @@ -13,8 +13,8 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "AlbrechtL"; repo = "welle.io"; - rev = "V${version}"; - sha256 = "1fsr0c2w16z45mcr85sqmllw1xf2gn6hp6f6fmgx2zfprq8gdmcr"; + rev = "v${version}"; + sha256 = "0cp8dyswgwidabaj9bvkkc6hl3160096j6myckd5bw00zxnbfiqn"; }; nativeBuildInputs = [ cmake pkgconfig ]; @@ -22,7 +22,9 @@ in stdenv.mkDerivation { buildInputs = [ faad2 fftwSinglePrec + lame libusb + mpg123 qtbase qtcharts qtmultimedia @@ -38,7 +40,7 @@ in stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A DAB/DAB+ Software Radio"; homepage = https://www.welle.io/; maintainers = with maintainers; [ ck3d markuskowa ]; |