haskell-bustle: simplify the override now that those changes are in cabal2nix
Might be of interest to @jtojnar.
This commit is contained in:
parent
6d068993b5
commit
5e90d04ee7
@ -602,22 +602,8 @@ self: super: {
|
|||||||
# https://github.com/athanclark/sets/issues/2
|
# https://github.com/athanclark/sets/issues/2
|
||||||
sets = dontCheck super.sets;
|
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.
|
# Install icons, metadata and cli program.
|
||||||
(bustle: overrideCabal bustle (drv: {
|
bustle = overrideCabal super.bustle (drv: {
|
||||||
buildDepends = [ pkgs.libpcap ];
|
buildDepends = [ pkgs.libpcap ];
|
||||||
buildTools = with pkgs.buildPackages; [ gettext perl help2man ];
|
buildTools = with pkgs.buildPackages; [ gettext perl help2man ];
|
||||||
patches = [
|
patches = [
|
||||||
@ -635,8 +621,7 @@ 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: {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user