diff options
| author | Elis Hirwing <elis@hirwing.se> | 2019-02-14 07:21:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-14 07:21:48 +0100 |
| commit | 23fa0f817aa022d2cd95f3539ac2a757aa4029dd (patch) | |
| tree | 9eef4e09a2526dc268c065dc2c1a39056fcb1ac1 | |
| parent | 6a56ab5bc887c1be24c7b390fe9222988982c987 (diff) | |
| parent | daee1d7a58ee7c6da8a02f6d3e9895106eadfacc (diff) | |
Merge pull request #55529 from etu/move-ebook2cw
ebook2cw: Move from misc to radio and do some cleanups
| -rw-r--r-- | pkgs/applications/radio/ebook2cw/configfile.patch (renamed from pkgs/applications/misc/ebook2cw/configfile.patch) | 0 | ||||
| -rw-r--r-- | pkgs/applications/radio/ebook2cw/default.nix (renamed from pkgs/applications/misc/ebook2cw/default.nix) | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 3 insertions, 9 deletions
diff --git a/pkgs/applications/misc/ebook2cw/configfile.patch b/pkgs/applications/radio/ebook2cw/configfile.patch index c7aafe5227a53..c7aafe5227a53 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 cce10258cf3bb..915d0ba84db37 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 6b292ae20e3be..c185df8336768 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 { }; |