diff options
author | Peter Simons <simons@cryp.to> | 2017-12-17 08:42:05 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-17 08:42:05 +0100 |
commit | 2737faba4738c7f99a95cb949837bfbcbc883a64 (patch) | |
tree | eadde54b9b775a05338dc9ecacfb423e6a59c8da /pkgs/development/haskell-modules/configuration-common.nix | |
parent | 70fd5c4fc760008d09672505467aaaf6641fbeb5 (diff) | |
parent | 07c375d9fc18abef3650f51a2de500ccaf658f00 (diff) | |
download | nixlib-2737faba4738c7f99a95cb949837bfbcbc883a64.tar nixlib-2737faba4738c7f99a95cb949837bfbcbc883a64.tar.gz nixlib-2737faba4738c7f99a95cb949837bfbcbc883a64.tar.bz2 nixlib-2737faba4738c7f99a95cb949837bfbcbc883a64.tar.lz nixlib-2737faba4738c7f99a95cb949837bfbcbc883a64.tar.xz nixlib-2737faba4738c7f99a95cb949837bfbcbc883a64.tar.zst nixlib-2737faba4738c7f99a95cb949837bfbcbc883a64.zip |
Merge pull request #32746 from jtojnar/bustle
haskellPackages.bustle: build icons and metadata
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 961d250efb63..75122e1668a2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -628,6 +628,19 @@ self: super: { # https://github.com/lens/lens-aeson/issues/18 lens-aeson = dontCheck super.lens-aeson; + # Install icons and metadata, remove broken hgettext dependency. + # https://github.com/vasylp/hgettext/issues/10 + bustle = overrideCabal super.bustle (drv: { + configureFlags = drv.configureFlags or [] ++ ["-f-hgettext"]; + executableHaskellDepends = pkgs.lib.remove self.hgettext drv.executableHaskellDepends; + buildDepends = [ pkgs.libpcap ]; + buildTools = with pkgs; [ gettext perl help2man intltool ]; + doCheck = false; # https://github.com/wjt/bustle/issues/6 + postInstall = '' + make install PREFIX=$out + ''; + }); + # Byte-compile elisp code for Emacs. ghc-mod = overrideCabal super.ghc-mod (drv: { preCheck = "export HOME=$TMPDIR"; |