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

bustle: fix build

Browse Source
This commit is contained in:
Jan Tojnar 2019-10-18 02:07:18 +02:00
parent 2332cb7dbc
commit 538d9cbdfb
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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