From 5e90d04ee7bb71bbea604e2820939fe936f96e24 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 31 Jan 2020 21:38:10 +0100
Subject: haskell-bustle: simplify the override now that those changes are in
 cabal2nix

Might be of interest to @jtojnar.
---
 .../haskell-modules/configuration-common.nix       | 55 ++++++++--------------
 1 file changed, 20 insertions(+), 35 deletions(-)

(limited to 'pkgs/development/haskell-modules')

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8f127e9490de..5e43d516e911 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -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: {
-- 
cgit 1.4.1