ebook2cw: Move from misc to radio and do some cleanups

3 files changed, 3 insertions, 9 deletions

diff --git a/pkgs/applications/misc/ebook2cw/configfile.patch b/pkgs/applications/radio/ebook2cw/configfile.patch
index c7aafe5227a5..c7aafe5227a5 100644
--- a/pkgs/applications/misc/ebook2cw/configfile.patch
+++ b/pkgs/applications/radio/ebook2cw/configfile.patch
diff --git a/pkgs/applications/misc/ebook2cw/default.nix b/pkgs/applications/radio/ebook2cw/default.nix
index cce10258cf3b..915d0ba84db3 100644
--- a/pkgs/applications/misc/ebook2cw/default.nix
+++ b/pkgs/applications/radio/ebook2cw/default.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchsvn, lame, libvorbis }:
 
 stdenv.mkDerivation rec {
-
-  name = "ebook2cw-${version}";
+  pname = "ebook2cw";
   version = "0.8.2";
 
   src = fetchsvn {
-    url = "svn://svn.fkurz.net/ebook2cw/tags/${name}";
+    url = "svn://svn.fkurz.net/ebook2cw/tags/${pname}-${version}";
     sha256 = "1mvp3nz3k76v757792n9b7fcm5jm3jcwarl1k7cila9fi0c2rsiw";
   };
 
@@ -14,10 +13,6 @@ stdenv.mkDerivation rec {
 
   patches = [ ./configfile.patch ];
 
-  postPatch = ''
-    substituteInPlace Makefile --replace gcc cc
-  '';
-
   makeFlags = [ "DESTDIR=$(out)" ];
 
   meta = with stdenv.lib; {
@@ -27,5 +22,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.all;
     maintainers = with maintainers; [ earldouglas ];
   };
-
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f8c6b4f1706c..867b3a60a0bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -173,7 +173,7 @@ in
 
   dump1090 = callPackage ../applications/misc/dump1090 { };
 
-  ebook2cw = callPackage ../applications/misc/ebook2cw { };
+  ebook2cw = callPackage ../applications/radio/ebook2cw { };
 
   etBook = callPackage ../data/fonts/et-book { };