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

haskellPackages.bustle: clean up with lib.pipe

Browse Source
This commit is contained in:
Jan Tojnar 2020-01-26 16:17:23 +01:00 committed by Peter Simons
parent 8e8b8a5b6c
commit 3430ded6c8
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/haskell-modules/configuration-common.nix
View File

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