Merge branch 'master' of https://github.com/NixOS/nixpkgs into wayland-wm

1 files changed, 13 insertions, 18 deletions

diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix
index 1ba3ee5268f7..b0879599833b 100644
--- a/pkgs/applications/misc/dmenu/default.nix
+++ b/pkgs/applications/misc/dmenu/default.nix
@@ -1,35 +1,30 @@
-{stdenv, fetchurl, libX11, libXinerama, enableXft, libXft, zlib}:
-
-with stdenv.lib;
+{ stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? null }:
 
 stdenv.mkDerivation rec {
-  name = "dmenu-4.5";
+  name = "dmenu-4.6";
 
   src = fetchurl {
     url = "http://dl.suckless.org/tools/${name}.tar.gz";
-    sha256 = "0l58jpxrr80fmyw5pgw5alm5qry49aw6y049745wl991v2cdcb08";
-  };
-
-  xftPatch = fetchurl {
-    url = "http://tools.suckless.org/dmenu/patches/${name}-xft.diff";
-    sha256 = "efb4095d65e5e86f9dde97294732174409c24f319bdd4824cc22fa1404972b4f";
+    sha256 = "1cwnvamqqlgczvd5dv5rsgqbhv8kp0ddjnhmavb3q732i8028yja";
   };
 
-  buildInputs = [ libX11 libXinerama ] ++ optionals enableXft [zlib libXft];
+  buildInputs = [ libX11 libXinerama zlib libXft ];
 
-  patches = optional enableXft xftPatch;
+  inherit patches;
 
   postPatch = ''
     sed -ri -e 's!\<(dmenu|stest)\>!'"$out/bin"'/&!g' dmenu_run
   '';
 
-  preConfigure = [ ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'' ];
+  preConfigure = ''
+    sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk
+  '';
 
-  meta = { 
-      description = "a generic, highly customizable, and efficient menu for the X Window System";
+  meta = with stdenv.lib; {
+      description = "A generic, highly customizable, and efficient menu for the X Window System";
       homepage = http://tools.suckless.org/dmenu;
-      license = stdenv.lib.licenses.mit;
-      maintainers = with stdenv.lib.maintainers; [viric];
-      platforms = with stdenv.lib.platforms; all;
+      license = licenses.mit;
+      maintainers = with maintainers; [ viric pSub ];
+      platforms = platforms.all;
   };
 }