diff --git a/pkgs/applications/audio/ekho/default.nix b/pkgs/by-name/ek/ekho/package.nix similarity index 86% rename from pkgs/applications/audio/ekho/default.nix rename to pkgs/by-name/ek/ekho/package.nix index c0cde8aaf9a1..043908298266 100644 --- a/pkgs/applications/audio/ekho/default.nix +++ b/pkgs/by-name/ek/ekho/package.nix @@ -10,17 +10,17 @@ , espeak-ng , sonic , utf8cpp -, AudioUnit +, darwin }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ekho"; version = "9.0"; src = fetchFromGitHub { owner = "hgneng"; repo = "ekho"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-VYN9tR3BJXd3UA0V5vqQJNItJe1e1knZ+S7tLeaeYYk="; }; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoconf automake libtool ]; buildInputs = [ libsndfile libpulseaudio espeak-ng sonic utf8cpp ] - ++ lib.optionals stdenv.isDarwin [ AudioUnit ]; + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AudioUnit ]; meta = with lib; { description = "Chinese text-to-speech software"; @@ -51,5 +51,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ aaronjheng ]; + mainProgram = "ekho"; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d13526153f6..bdc85bebc9df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29508,10 +29508,6 @@ with pkgs; oed = callPackage ../applications/editors/oed { }; - ekho = callPackage ../applications/audio/ekho { - inherit (darwin.apple_sdk.frameworks) AudioUnit; - }; - electron-cash = libsForQt5.callPackage ../applications/misc/electron-cash { }; electrum = libsForQt5.callPackage ../applications/misc/electrum { };