Merge staging-next into staging

2 files changed, 2 insertions, 62 deletions

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
index 1c698809791b..9a908039b8f5 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
@@ -5,6 +5,8 @@ let
   inherit (self) callPackage;
 in
 {
+  inherit (pkgs) emacspeak;
+
   acm = callPackage ./manual-packages/acm { };
 
   acm-terminal = callPackage ./manual-packages/acm-terminal { };
@@ -31,8 +33,6 @@ in
 
   elisp-ffi = callPackage ./manual-packages/elisp-ffi { };
 
-  emacspeak = callPackage ./manual-packages/emacspeak { };
-
   ess-R-object-popup = callPackage ./manual-packages/ess-R-object-popup { };
 
   evil-markdown = callPackage ./manual-packages/evil-markdown { };
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacspeak/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacspeak/default.nix
deleted file mode 100644
index 5294623584da..000000000000
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacspeak/default.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, makeWrapper
-, emacs
-, tcl
-, tclx
-, espeak-ng
-}:
-
-stdenv.mkDerivation rec {
-  pname = "emacspeak";
-  version = "58.0";
-
-  src = fetchFromGitHub {
-    owner = "tvraman";
-    repo = pname;
-    rev = version;
-    hash= "sha256-5pWC17nvy3ZuG0bR//LqDVpKsH5hFSFf63Q33a1BfBk=";
-  };
-
-  nativeBuildInputs = [
-    emacs
-    makeWrapper
-  ];
-  buildInputs = [
-    espeak-ng
-    tcl
-    tclx
-  ];
-
-  preConfigure = ''
-    make config
-  '';
-
-  postBuild = ''
-    make -C servers/native-espeak PREFIX=$out "TCL_INCLUDE=${tcl}/include"
-  '';
-
-  postInstall = ''
-    make -C servers/native-espeak PREFIX=$out install
-    local d=$out/share/emacs/site-lisp/emacspeak/
-    install -d -- "$d"
-    cp -a .  "$d"
-    find "$d" \( -type d -or \( -type f -executable \) \) -execdir chmod 755 {} +
-    find "$d" -type f -not -executable -execdir chmod 644 {} +
-    makeWrapper ${emacs}/bin/emacs $out/bin/emacspeak \
-        --set DTK_PROGRAM "${placeholder "out"}/share/emacs/site-lisp/emacspeak/servers/espeak" \
-        --set TCLLIBPATH "${tclx}/lib" \
-        --add-flags '-l "${placeholder "out"}/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.elc"'
-  '';
-
-  meta = with lib; {
-    homepage = "https://github.com/tvraman/emacspeak/";
-    description = "Emacs extension that provides spoken output";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.AndersonTorres ];
-    platforms = platforms.linux;
-  };
-}