From 93168d887ce0fbacb5549b9e7a46162f4bcf41b6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 7 Aug 2018 11:13:55 +0200 Subject: [PATCH] bustle: fix build --- .../haskell-modules/configuration-common.nix | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e9647200abd..5adef91f420 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -601,19 +601,7 @@ self: super: { # Install icons, metadata and cli program. bustle = overrideCabal super.bustle (drv: { buildDepends = [ pkgs.libpcap ]; - buildTools = with pkgs.buildPackages; [ gettext perl help2man intltool ]; - patches = [ - # Add missing gio-unix-2.0 dependency - (pkgs.fetchpatch { - url = https://github.com/wjt/bustle/commit/bcc3d56d367635c0dfdb4eab0d1265829aba6400.patch; - sha256 = "1ybviivfbs5janiyw01ww365vxckni6fk0j10609clxk4na2nvb9"; - }) - # No instance for (Semigroup Marquee) - (pkgs.fetchpatch { - url = https://github.com/wjt/bustle/commit/95393cb17c2fe5f0903470a449e36728471759eb.patch; - sha256 = "1n7h1rh62731kg9jjs2mn49nx033ds0l33mpgfl75hrjqblz44m1"; - }) - ]; + buildTools = with pkgs.buildPackages; [ gettext perl help2man ]; postInstall = '' make install PREFIX=$out '';