haskellPackages.bustle: clean up with lib.pipe

This commit is contained in:
Jan Tojnar 2020-01-26 16:17:23 +01:00 committed by Peter Simons
parent 8e8b8a5b6c
commit 3430ded6c8

View File

@ -602,10 +602,14 @@ self: super: {
# https://github.com/athanclark/sets/issues/2
sets = dontCheck super.sets;
# Install icons, metadata and cli program.
bustle = pkgs.lib.pipe super.bustle [
# Do not build hgettext as it is broken
# https://gitlab.freedesktop.org/bustle/bustle/issues/13
bustle = overrideCabal (disableCabalFlag (super.bustle.override { hgettext = null; }) "hgettext") (drv: {
(bustle: bustle.override { hgettext = null; })
(bustle: disableCabalFlag bustle "hgettext")
# Install icons, metadata and cli program.
(bustle: overrideCabal bustle (drv: {
buildDepends = [ pkgs.libpcap ];
buildTools = with pkgs.buildPackages; [ gettext perl help2man ];
patches = [
@ -623,7 +627,8 @@ self: super: {
postInstall = ''
make install PREFIX=$out
'';
});
}))
];
# Byte-compile elisp code for Emacs.
ghc-mod = overrideCabal super.ghc-mod (drv: {