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

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

@ -602,28 +602,33 @@ 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; })
buildDepends = [ pkgs.libpcap ]; (bustle: disableCabalFlag bustle "hgettext")
buildTools = with pkgs.buildPackages; [ gettext perl help2man ];
patches = [ # Install icons, metadata and cli program.
# fix build (bustle: overrideCabal bustle (drv: {
# https://gitlab.freedesktop.org/bustle/bustle/merge_requests/14 buildDepends = [ pkgs.libpcap ];
(pkgs.fetchpatch { buildTools = with pkgs.buildPackages; [ gettext perl help2man ];
url = "https://gitlab.freedesktop.org/bustle/bustle/commit/ee4b81cbc232d47ba9940f1987777b17452e71ff.patch"; patches = [
sha256 = "0v9cvbmrma5jcqcg1narpm1549h0cg8mr6i00qxmq0x6hs04dnwa"; # fix build
}) # https://gitlab.freedesktop.org/bustle/bustle/merge_requests/14
(pkgs.fetchpatch { (pkgs.fetchpatch {
url = "https://gitlab.freedesktop.org/bustle/bustle/commit/aae6843f51f54679d440fb3813e61355dc8406b9.patch"; url = "https://gitlab.freedesktop.org/bustle/bustle/commit/ee4b81cbc232d47ba9940f1987777b17452e71ff.patch";
sha256 = "1a8hr38hd1gdkqhsy56hyl7njw8ci79iigr81aalkb7hn4ckvh2a"; sha256 = "0v9cvbmrma5jcqcg1narpm1549h0cg8mr6i00qxmq0x6hs04dnwa";
}) })
]; (pkgs.fetchpatch {
postInstall = '' url = "https://gitlab.freedesktop.org/bustle/bustle/commit/aae6843f51f54679d440fb3813e61355dc8406b9.patch";
make install PREFIX=$out sha256 = "1a8hr38hd1gdkqhsy56hyl7njw8ci79iigr81aalkb7hn4ckvh2a";
''; })
}); ];
postInstall = ''
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: {