cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

haskell-bustle: simplify the override now that those changes are in cabal2nix

Browse source 
Might be of interest to @jtojnar.
This commit is contained in:
Peter Simons 2020-01-31 21:38:10 +01:00
parent 6d068993b5
commit 5e90d04ee7
1 changed files with 20 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -602,41 +602,26 @@ self: super: {
# https://github.com/athanclark/sets/issues/2
sets = dontCheck super.sets;
bustle = pkgs.lib.pipe super.bustle [
# Do not build hgettext as it is broken
# https://gitlab.freedesktop.org/bustle/bustle/issues/13
(bustle: bustle.override { hgettext = null; })
(bustle: disableCabalFlag bustle "hgettext")
# Bustle specifies OtherLicense even though the code is actually LGPL
# https://gitlab.freedesktop.org/bustle/bustle/merge_requests/17
(bustle: bustle.overrideAttrs (attrs: {
meta = builtins.removeAttrs attrs.meta [ "hydraPlatforms" ] // {
license = pkgs.lib.licenses.lgpl21Plus;
};
}))
# Install icons, metadata and cli program.
(bustle: overrideCabal bustle (drv: {
buildDepends = [ pkgs.libpcap ];
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 = ''
make install PREFIX=$out
'';
}))
];
# Install icons, metadata and cli program.
bustle = overrideCabal super.bustle (drv: {
buildDepends = [ pkgs.libpcap ];
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 = ''
make install PREFIX=$out
'';
});
# Byte-compile elisp code for Emacs.
ghc-mod = overrideCabal super.ghc-mod (drv: {