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: a0b86e3b64b2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 568fd9c1917e
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 5, 2020

  1. qsstv: 9.2.6 -> 9.4.4

    @hax404
    hax404 committed Jan 5, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    GPG key ID: 7FAB2A15F7A607A4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ac1ddc7 View commit details

Commits on Jan 8, 2020

  1. qsstv: remove additional desktop item

    @hax404
    hax404 committed Jan 8, 2020
    Copy the full SHA
    304d6cf View commit details

  2. Merge pull request #76991 from hax404/qsstv 

    qsstv: 9.2.6 -> 9.4.4; cleanup
    @markuskowa
    markuskowa authored Jan 8, 2020
    Copy the full SHA
    568fd9c View commit details
Showing with 5 additions and 23 deletions.
  1. +5 −23 pkgs/applications/radio/qsstv/default.nix
28 changes: 5 additions & 23 deletions pkgs/applications/radio/qsstv/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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; {