diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-01-11 23:37:02 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-01-11 23:41:30 +0000 |
commit | 6c557e3f1c28cf87e9fba232811d6875dd1399c1 (patch) | |
tree | 035a071d5d8980df6de0fa42e2ef8fc0cce7055e /nixpkgs/pkgs/applications/radio/qsstv | |
parent | da7500bc026e937ac7fce7b50f67a0e1765737a7 (diff) | |
parent | e4134747f5666bcab8680aff67fa3b63384f9a0f (diff) | |
download | nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.gz nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.bz2 nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.lz nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.xz nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.zst nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.zip |
Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f'
Diffstat (limited to 'nixpkgs/pkgs/applications/radio/qsstv')
-rw-r--r-- | nixpkgs/pkgs/applications/radio/qsstv/default.nix | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/nixpkgs/pkgs/applications/radio/qsstv/default.nix b/nixpkgs/pkgs/applications/radio/qsstv/default.nix index db1bfbb3f89e..a4ef5a2a0d1b 100644 --- a/nixpkgs/pkgs/applications/radio/qsstv/default.nix +++ b/nixpkgs/pkgs/applications/radio/qsstv/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, qtbase, qmake, makeDesktopItem, openjpeg, pkgconfig, fftw, +{ mkDerivation, stdenv, fetchurl, qtbase, qmake, 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; @@ -20,27 +20,9 @@ stdenv.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 to the right location - make install INSTALL_ROOT=$out - mv $out/usr/bin $out/ - rm -r $out/usr - + 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; { |