diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-08-24 23:25:55 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-08-27 02:33:34 +0200 |
| commit | 65890d6644f7349e68bf774234380f4a568cb0a5 (patch) | |
| tree | 9428fd3730a9870488677619f5353249e78dfe3f | |
| parent | 3d25e96b1fd82d65bdb390c622a758531e9cd6a7 (diff) | |
| download | nixpkgs-65890d6644f7349e68bf774234380f4a568cb0a5.tar nixpkgs-65890d6644f7349e68bf774234380f4a568cb0a5.tar.gz nixpkgs-65890d6644f7349e68bf774234380f4a568cb0a5.tar.bz2 nixpkgs-65890d6644f7349e68bf774234380f4a568cb0a5.tar.lz nixpkgs-65890d6644f7349e68bf774234380f4a568cb0a5.tar.xz nixpkgs-65890d6644f7349e68bf774234380f4a568cb0a5.tar.zst nixpkgs-65890d6644f7349e68bf774234380f4a568cb0a5.zip | |
gqrx: 2.5.3 -> 2.7
| -rw-r--r-- | pkgs/applications/misc/gqrx/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 8 insertions, 12 deletions
diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix index 5ad03c88c64..a0672f1810f 100644 --- a/pkgs/applications/misc/gqrx/default.nix +++ b/pkgs/applications/misc/gqrx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qt4, qmake4Hook, gnuradio, boost, gnuradio-osmosdr +{ stdenv, fetchFromGitHub, cmake, qtbase, qtsvg, gnuradio, boost, gnuradio-osmosdr # drivers (optional): , rtl-sdr, hackrf , pulseaudioSupport ? true, libpulseaudio @@ -8,29 +8,25 @@ assert pulseaudioSupport -> libpulseaudio != null; stdenv.mkDerivation rec { name = "gqrx-${version}"; - version = "2.5.3"; + version = "2.7"; src = fetchFromGitHub { owner = "csete"; repo = "gqrx"; rev = "v${version}"; - sha256 = "02pavd1kc0gsnrl18bfa01r2f3j4j05zly4a8zwss9yrsgf8432x"; + sha256 = "1dslb8l8ggj6vf9257c2bj0z8z1wy9c6sr2zksp5jdgf8m4j71im"; }; - nativeBuildInputs = [ qmake4Hook ]; - + nativeBuildInputs = [ cmake ]; buildInputs = [ - qt4 gnuradio boost gnuradio-osmosdr rtl-sdr hackrf + qtbase qtsvg gnuradio boost gnuradio-osmosdr rtl-sdr hackrf ] ++ stdenv.lib.optionals pulseaudioSupport [ libpulseaudio ]; enableParallelBuilding = true; postInstall = '' - mkdir -p "$out/share/applications" - mkdir -p "$out/share/icons" - - cp gqrx.desktop "$out/share/applications/" - cp resources/icons/gqrx.svg "$out/share/icons/" + install -vD $src/gqrx.desktop -t "$out/share/applications/" + install -vD $src/resources/icons/gqrx.svg -t "$out/share/icons/" ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca8b5690dfe..5ad587a4483 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14228,7 +14228,7 @@ with pkgs; gtk2 = gtk2-x11; }; - gqrx = callPackage ../applications/misc/gqrx { }; + gqrx = qt5.callPackage ../applications/misc/gqrx { }; grass = callPackage ../applications/gis/grass { }; |