From 4734ec3058d853c8d511bdcf57bb48b29ce0b6a9 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 9 Feb 2019 19:31:24 +0100 Subject: welle-io: Move from misc to radio --- pkgs/applications/misc/welle-io/default.nix | 47 ---------------------------- pkgs/applications/radio/welle-io/default.nix | 47 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 48 insertions(+), 48 deletions(-) delete mode 100644 pkgs/applications/misc/welle-io/default.nix create mode 100644 pkgs/applications/radio/welle-io/default.nix diff --git a/pkgs/applications/misc/welle-io/default.nix b/pkgs/applications/misc/welle-io/default.nix deleted file mode 100644 index acf0226c0db5..000000000000 --- a/pkgs/applications/misc/welle-io/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig -, qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2 -, faad2, rtl-sdr, soapysdr-with-plugins, libusb, fftwSinglePrec }: -let - - version = "1.0"; - -in stdenv.mkDerivation { - - name = "welle-io-${version}"; - - src = fetchFromGitHub { - owner = "AlbrechtL"; - repo = "welle.io"; - rev = "V${version}"; - sha256 = "1fsr0c2w16z45mcr85sqmllw1xf2gn6hp6f6fmgx2zfprq8gdmcr"; - }; - - nativeBuildInputs = [ cmake pkgconfig ]; - - buildInputs = [ - faad2 - fftwSinglePrec - libusb - qtbase - qtcharts - qtmultimedia - qtquickcontrols - qtquickcontrols2 - rtl-sdr - soapysdr-with-plugins - ]; - - cmakeFlags = [ - "-DRTLSDR=true" "-DSOAPYSDR=true" - ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "A DAB/DAB+ Software Radio"; - homepage = https://www.welle.io/; - maintainers = with maintainers; [ ck3d markuskowa ]; - license = licenses.gpl2; - platforms = with platforms; [ "x86_64-linux" "i686-linux" ] ++ darwin; - }; -} diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/applications/radio/welle-io/default.nix new file mode 100644 index 000000000000..acf0226c0db5 --- /dev/null +++ b/pkgs/applications/radio/welle-io/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2 +, faad2, rtl-sdr, soapysdr-with-plugins, libusb, fftwSinglePrec }: +let + + version = "1.0"; + +in stdenv.mkDerivation { + + name = "welle-io-${version}"; + + src = fetchFromGitHub { + owner = "AlbrechtL"; + repo = "welle.io"; + rev = "V${version}"; + sha256 = "1fsr0c2w16z45mcr85sqmllw1xf2gn6hp6f6fmgx2zfprq8gdmcr"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ + faad2 + fftwSinglePrec + libusb + qtbase + qtcharts + qtmultimedia + qtquickcontrols + qtquickcontrols2 + rtl-sdr + soapysdr-with-plugins + ]; + + cmakeFlags = [ + "-DRTLSDR=true" "-DSOAPYSDR=true" + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A DAB/DAB+ Software Radio"; + homepage = https://www.welle.io/; + maintainers = with maintainers; [ ck3d markuskowa ]; + license = licenses.gpl2; + platforms = with platforms; [ "x86_64-linux" "i686-linux" ] ++ darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 02a0ab2e5b81..880ca9d442d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17176,7 +17176,7 @@ in wavrsocvt = callPackage ../applications/misc/audio/wavrsocvt { }; - welle-io = libsForQt5.callPackage ../applications/misc/welle-io { }; + welle-io = libsForQt5.callPackage ../applications/radio/welle-io { }; wireshark = callPackage ../applications/networking/sniffers/wireshark { withQt = true; -- cgit 1.4.1