From 913e340c9a991fb739fd03263d3e0309718546c9 Mon Sep 17 00:00:00 2001
From: Ricky Elrod <ricky@elrod.me>
Date: Sun, 11 May 2014 17:11:10 -0400
Subject: Add fldigi package

Signed-off-by: Ricky Elrod <ricky@elrod.me>
---
 pkgs/applications/audio/fldigi/default.nix | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 pkgs/applications/audio/fldigi/default.nix

(limited to 'pkgs/applications/audio')

diff --git a/pkgs/applications/audio/fldigi/default.nix b/pkgs/applications/audio/fldigi/default.nix
new file mode 100644
index 000000000000..578619eb3f89
--- /dev/null
+++ b/pkgs/applications/audio/fldigi/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, hamlib, fltk13, libjpeg, libpng, portaudio, libsndfile,
+  libsamplerate, pulseaudio, libXinerama, gettext, pkgconfig, alsaLib }:
+
+stdenv.mkDerivation rec {
+  version = "3.21.82";
+  name = "fldigi";
+
+  src = fetchurl {
+    url = "http://www.w1hkj.com/downloads/${name}/${name}-${version}.tar.gz";
+    sha256 = "1q2fc1zm9kfsjir4g6fh95vmjdq984iyxfcs6q4gjqy1znhqcyqs";
+  };
+
+  buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio
+                  libsndfile libsamplerate pulseaudio pkgconfig alsaLib ];
+
+  meta = {
+    description = "Digital modem program";
+    homepage = http://www.w1hkj.com/Fldigi.html;
+    license = stdenv.lib.licenses.gpl3Plus;
+    maintainers = with stdenv.lib.maintainers; [ relrod ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
-- 
cgit 1.4.1


From 0c45c818129a65de402eaf332a46007281640308 Mon Sep 17 00:00:00 2001
From: Ricky Elrod <ricky@elrod.me>
Date: Sun, 11 May 2014 18:16:11 -0400
Subject: Use name and pname to follow conventions

Signed-off-by: Ricky Elrod <ricky@elrod.me>
---
 pkgs/applications/audio/fldigi/default.nix    | 5 +++--
 pkgs/development/libraries/hamlib/default.nix | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'pkgs/applications/audio')

diff --git a/pkgs/applications/audio/fldigi/default.nix b/pkgs/applications/audio/fldigi/default.nix
index 578619eb3f89..e78095a9c5df 100644
--- a/pkgs/applications/audio/fldigi/default.nix
+++ b/pkgs/applications/audio/fldigi/default.nix
@@ -3,10 +3,11 @@
 
 stdenv.mkDerivation rec {
   version = "3.21.82";
-  name = "fldigi";
+  pname = "fldigi";
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://www.w1hkj.com/downloads/${name}/${name}-${version}.tar.gz";
+    url = "http://www.w1hkj.com/downloads/${pname}/${name}.tar.gz";
     sha256 = "1q2fc1zm9kfsjir4g6fh95vmjdq984iyxfcs6q4gjqy1znhqcyqs";
   };
 
diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix
index 495c7e99d4b2..e0a6e23c972f 100644
--- a/pkgs/development/libraries/hamlib/default.nix
+++ b/pkgs/development/libraries/hamlib/default.nix
@@ -2,11 +2,12 @@
  boost, libtool, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "hamlib";
+  pname = "hamlib";
   version = "1.2.15.3";
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz";
+    url = "mirror://sourceforge/${pname}/${name}.tar.gz";
     sha256 = "0ppp6fc2h9d8p30j2s9wlqd620kmnny4wd8fc3jxd6gxwi4lbjm2";
   };
 
-- 
cgit 1.4.1