Merge pull request #32746 from jtojnar/bustle

haskellPackages.bustle: build icons and metadata
This commit is contained in:
Peter Simons 2017-12-17 08:42:05 +01:00 committed by GitHub
commit 2737faba47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -628,6 +628,19 @@ self: super: {
# https://github.com/lens/lens-aeson/issues/18
lens-aeson = dontCheck super.lens-aeson;
# Install icons and metadata, remove broken hgettext dependency.
# https://github.com/vasylp/hgettext/issues/10
bustle = overrideCabal super.bustle (drv: {
configureFlags = drv.configureFlags or [] ++ ["-f-hgettext"];
executableHaskellDepends = pkgs.lib.remove self.hgettext drv.executableHaskellDepends;
buildDepends = [ pkgs.libpcap ];
buildTools = with pkgs; [ gettext perl help2man intltool ];
doCheck = false; # https://github.com/wjt/bustle/issues/6
postInstall = ''
make install PREFIX=$out
'';
});
# Byte-compile elisp code for Emacs.
ghc-mod = overrideCabal super.ghc-mod (drv: {
preCheck = "export HOME=$TMPDIR";