Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c91a1be87720
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1d9e1d4f2dcf
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 31, 2019

  1. welle-io: 1.0 -> 2.0

    @markuskowa
    markuskowa committed Oct 31, 2019
    Copy the full SHA
    b612241 View commit details

  2. Merge pull request #72355 from markuskowa/upd-welle 

    welle-io: 1.0 -> 2.0
    @mmahut
    mmahut authored Oct 31, 2019
    Copy the full SHA
    1d9e1d4 View commit details
Showing with 9 additions and 7 deletions.
  1. +9 −7 pkgs/applications/radio/welle-io/default.nix
16 changes: 9 additions & 7 deletions pkgs/applications/radio/welle-io/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,30 @@
{ 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;

src = fetchFromGitHub {
owner = "AlbrechtL";
repo = "welle.io";
rev = "V${version}";
sha256 = "1fsr0c2w16z45mcr85sqmllw1xf2gn6hp6f6fmgx2zfprq8gdmcr";
rev = "v${version}";
sha256 = "0cp8dyswgwidabaj9bvkkc6hl3160096j6myckd5bw00zxnbfiqn";
};

nativeBuildInputs = [ cmake pkgconfig ];

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 ];