public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dmenu: 4.5 -> 4.6

Browse Source 
xft support is now upstream
This commit is contained in:
Pascal Wittmann 2015-11-10 09:56:10 +01:00
parent 0c520e943c
commit 5cf90b546c
2 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/applications/misc/dmenu/default.nix
View File

@ -1,35 +1,28 @@
{stdenv, fetchurl, libX11, libXinerama, enableXft, libXft, zlib}: {stdenv, fetchurl, libX11, libXinerama, libXft, zlib}:
with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dmenu-4.5"; name = "dmenu-4.6";
src = fetchurl { src = fetchurl {
url = "http://dl.suckless.org/tools/${name}.tar.gz"; url = "http://dl.suckless.org/tools/${name}.tar.gz";
sha256 = "0l58jpxrr80fmyw5pgw5alm5qry49aw6y049745wl991v2cdcb08"; sha256 = "1cwnvamqqlgczvd5dv5rsgqbhv8kp0ddjnhmavb3q732i8028yja";
}; };
xftPatch = fetchurl { buildInputs = [ libX11 libXinerama zlib libXft ];
url = "http://tools.suckless.org/dmenu/patches/${name}-xft.diff";
sha256 = "efb4095d65e5e86f9dde97294732174409c24f319bdd4824cc22fa1404972b4f";
};
buildInputs = [ libX11 libXinerama ] ++ optionals enableXft [zlib libXft];
patches = optional enableXft xftPatch;
postPatch = '' postPatch = ''
sed -ri -e 's!\<(dmenu|stest)\>!'"$out/bin"'/&!g' dmenu_run 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 = { meta = with stdenv.lib; {
description = "a generic, highly customizable, and efficient menu for the X Window System"; description = "A generic, highly customizable, and efficient menu for the X Window System";
homepage = http://tools.suckless.org/dmenu; homepage = http://tools.suckless.org/dmenu;
license = stdenv.lib.licenses.mit; license = licenses.mit;
maintainers = with stdenv.lib.maintainers; [viric]; maintainers = with maintainers; [ viric pSub ];
platforms = with stdenv.lib.platforms; all; platforms = platforms.all;
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -11215,9 +11215,7 @@ let
djview = callPackage ../applications/graphics/djview { }; djview = callPackage ../applications/graphics/djview { };
djview4 = pkgs.djview; djview4 = pkgs.djview;
dmenu = callPackage ../applications/misc/dmenu { dmenu = callPackage ../applications/misc/dmenu { };
enableXft = true;
};
dmenu2 = callPackage ../applications/misc/dmenu2 { }; dmenu2 = callPackage ../applications/misc/dmenu2 { };