summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2018-01-18 22:12:56 +0100
committerJan Tojnar <jtojnar@gmail.com>2018-01-18 22:13:57 +0100
commitc278dd0b9dd893d0a03a22286280847b38a1ee06 (patch)
tree71cf2af9ddbd62fb7966c496cf8abf8abab69e56 /pkgs
parent1956ef5cd3b6800d46c584a4f299d5d1100ed3dc (diff)
downloadnixpkgs-c278dd0b9dd893d0a03a22286280847b38a1ee06.tar
nixpkgs-c278dd0b9dd893d0a03a22286280847b38a1ee06.tar.gz
nixpkgs-c278dd0b9dd893d0a03a22286280847b38a1ee06.tar.bz2
nixpkgs-c278dd0b9dd893d0a03a22286280847b38a1ee06.tar.lz
nixpkgs-c278dd0b9dd893d0a03a22286280847b38a1ee06.tar.xz
nixpkgs-c278dd0b9dd893d0a03a22286280847b38a1ee06.tar.zst
nixpkgs-c278dd0b9dd893d0a03a22286280847b38a1ee06.zip
bustle: re-enable hgettext support
hgettext 0.1.31.0 builds again
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix5
1 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b65bc23cfa4..f1d0b302b92 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -543,11 +543,8 @@ self: super: {
   # https://github.com/athanclark/sets/issues/2
   sets = dontCheck super.sets;
 
-  # Install icons and metadata, remove broken hgettext dependency.
-  # https://github.com/vasylp/hgettext/issues/10
+  # Install icons, metadata and cli program.
   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