From ac1ddc70cf732512ea8980ba58b4d48cb1a4fcf5 Mon Sep 17 00:00:00 2001 From: Georg Haas Date: Sun, 5 Jan 2020 15:33:15 +0100 Subject: [PATCH 1/2] qsstv: 9.2.6 -> 9.4.4 --- pkgs/applications/radio/qsstv/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/radio/qsstv/default.nix b/pkgs/applications/radio/qsstv/default.nix index db1bfbb3f89..f05c2eee570 100644 --- a/pkgs/applications/radio/qsstv/default.nix +++ b/pkgs/applications/radio/qsstv/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, qtbase, qmake, makeDesktopItem, openjpeg, pkgconfig, fftw, - libpulseaudio, alsaLib, hamlib, libv4l, fftwFloat }: +{ mkDerivation, stdenv, fetchurl, qtbase, qmake, makeDesktopItem, openjpeg, + pkgconfig, fftw, libpulseaudio, alsaLib, hamlib, libv4l, fftwFloat }: -stdenv.mkDerivation rec { - version = "9.2.6"; +mkDerivation rec { + version = "9.4.4"; pname = "qsstv"; src = fetchurl { url = "http://users.telenet.be/on4qz/qsstv/downloads/qsstv_${version}.tar.gz"; - sha256 = "0sx70yk389fq5djvjwnam6ics5knmg9b5x608bk2sjbfxkila108"; + sha256 = "0f9hx6sy418cb23fadll298pqbc5l2lxsdivi4vgqbkvx7sw58zi"; }; enableParallelBuilding = true; @@ -31,10 +31,8 @@ stdenv.mkDerivation rec { }; installPhase = '' - # Install binary to the right location - make install INSTALL_ROOT=$out - mv $out/usr/bin $out/ - rm -r $out/usr + # Install binary + make install # Install desktop icon install -D qsstv/icons/qsstv.png $out/share/pixmaps/qsstv.png From 304d6cf8e78c917324dfaa89bb481e69256ce118 Mon Sep 17 00:00:00 2001 From: Georg Haas Date: Sun, 5 Jan 2020 15:40:04 +0100 Subject: [PATCH 2/2] qsstv: remove additional desktop item --- pkgs/applications/radio/qsstv/default.nix | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/radio/qsstv/default.nix b/pkgs/applications/radio/qsstv/default.nix index f05c2eee570..a4ef5a2a0d1 100644 --- a/pkgs/applications/radio/qsstv/default.nix +++ b/pkgs/applications/radio/qsstv/default.nix @@ -1,5 +1,5 @@ -{ mkDerivation, stdenv, fetchurl, qtbase, qmake, makeDesktopItem, openjpeg, - pkgconfig, fftw, libpulseaudio, alsaLib, hamlib, libv4l, fftwFloat }: +{ mkDerivation, stdenv, fetchurl, qtbase, qmake, openjpeg, pkgconfig, fftw, + libpulseaudio, alsaLib, hamlib, libv4l, fftwFloat }: mkDerivation rec { version = "9.4.4"; @@ -20,25 +20,9 @@ mkDerivation rec { buildInputs = [ qtbase openjpeg fftw libpulseaudio alsaLib hamlib libv4l fftwFloat ]; - desktopItem = makeDesktopItem { - name = "QSSTV"; - exec = "qsstv"; - icon = "qsstv.png"; - comment = "Qt-based slow-scan TV and fax"; - desktopName = "QSSTV"; - genericName = "qsstv"; - categories = "Application;HamRadio;"; - }; - - installPhase = '' - # Install binary - make install - + postInstall = '' # Install desktop icon install -D qsstv/icons/qsstv.png $out/share/pixmaps/qsstv.png - - # Install desktop item - cp -rv ${desktopItem}/share $out ''; meta = with stdenv.lib; {