diff --git a/pkgs/applications/misc/clipmenu/default.nix b/pkgs/applications/misc/clipmenu/default.nix index 7a47a0e3bc0..e6e4ede6ac1 100644 --- a/pkgs/applications/misc/clipmenu/default.nix +++ b/pkgs/applications/misc/clipmenu/default.nix @@ -1,6 +1,6 @@ -{ clipnotify, makeWrapper, xsel, dmenu2, utillinux, gawk, stdenv, fetchFromGitHub, lib }: +{ clipnotify, makeWrapper, xsel, dmenu, utillinux, gawk, stdenv, fetchFromGitHub, lib }: let - runtimePath = lib.makeBinPath [ clipnotify xsel dmenu2 utillinux gawk ]; + runtimePath = lib.makeBinPath [ clipnotify xsel dmenu utillinux gawk ]; in stdenv.mkDerivation rec { name = "clipmenu-${version}"; diff --git a/pkgs/applications/misc/dmenu2/default.nix b/pkgs/applications/misc/dmenu2/default.nix deleted file mode 100644 index 3d567603359..00000000000 --- a/pkgs/applications/misc/dmenu2/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{stdenv, fetchhg, libX11, libXinerama, libXft, zlib}: - -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "dmenu2-0.3pre-2014-07-08"; - - src = fetchhg { - url = "https://bitbucket.org/melek/dmenu2"; - rev = "36cb94a16edf928bdaaa636123392517ed469be0"; - sha256 = "1b17z5ypg6ij7zz3ncp3irc87raccna10y4w490c872a99lp23lv"; - }; - - buildInputs = [ libX11 libXinerama zlib libXft ]; - - postPatch = '' - sed -ri -e 's!\<(dmenu|stest)\>!'"$out/bin"'/&!g' dmenu_run - ''; - - preConfigure = [ ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'' ]; - - meta = { - description = "A patched fork of the original dmenu - an efficient dynamic menu for X"; - homepage = https://bitbucket.org/melek/dmenu2; - license = licenses.mit; - maintainers = [ maintainers.cstrahan ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e240d4cc5c6..87fbdcdcbfb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17549,7 +17549,11 @@ in dmenu = callPackage ../applications/misc/dmenu { }; - dmenu2 = callPackage ../applications/misc/dmenu2 { }; + # TODO (@primeos): Remove after the 19.09 branch-off: + dmenu2 = throw '' + The fork "dmenu2" is not maintained by upstream anymore. Please use the + original "dmenu" instead. + ''; dmensamenu = callPackage ../applications/misc/dmensamenu { inherit (python3Packages) buildPythonApplication requests;