diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix index 305087d59c87..1c6d1dacc7fd 100644 --- a/pkgs/development/tools/misc/cscope/default.nix +++ b/pkgs/development/tools/misc/cscope/default.nix @@ -1,8 +1,4 @@ -{ fetchurl, stdenv, ncurses, pkgconfig -, installEmacsMode ? false, emacs ? null -}: - -assert installEmacsMode -> emacs != null; +{ fetchurl, stdenv, ncurses, pkgconfig, emacs}: stdenv.mkDerivation rec { name = "cscope-15.7a"; @@ -21,9 +17,9 @@ stdenv.mkDerivation rec { configureFlags = "--with-ncurses=${ncurses}"; - buildInputs = [ ncurses pkgconfig ] ++ stdenv.lib.optional installEmacsMode emacs; + buildInputs = [ ncurses pkgconfig emacs ]; - postInstall = if installEmacsMode then '' + postInstall = '' # Install Emacs mode. cd "contrib/xcscope" @@ -33,7 +29,7 @@ stdenv.mkDerivation rec { ensureDir "$out/share/emacs/site-lisp" emacs --batch --eval '(byte-compile-file "xcscope.el")' cp xcscope.el{,c} "$out/share/emacs/site-lisp" - '' else ""; + ''; meta = { description = "Cscope, a developer's tool for browsing source code"; @@ -49,5 +45,9 @@ stdenv.mkDerivation rec { license = "BSD-style"; homepage = http://cscope.sourceforge.net/; + + maintainers = with stdenv.lib.maintainers; [viric]; + + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b1468e166654..2474a7c0cc93 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2662,7 +2662,6 @@ let cscope = import ../development/tools/misc/cscope { inherit fetchurl stdenv ncurses pkgconfig emacs; - installEmacsMode = getConfig [ "cscope" "installEmacsMode" ] false; }; dejagnu = import ../development/tools/misc/dejagnu {