diff options
| author | Michael Alan Dorman <mdorman@ironicdesign.com> | 2018-04-09 13:43:20 -0400 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2018-04-12 09:06:33 +0200 |
| commit | 9358f60f94c0f41c426d23b2fd85295e4dcf1290 (patch) | |
| tree | 4784c1802f415dd220f87bb54862c2eb7f443027 /pkgs/development/haskell-modules | |
| parent | 281775bb1a0c24468f1ad961b4c53e0074db675e (diff) | |
| download | nixlib-9358f60f94c0f41c426d23b2fd85295e4dcf1290.tar nixlib-9358f60f94c0f41c426d23b2fd85295e4dcf1290.tar.gz nixlib-9358f60f94c0f41c426d23b2fd85295e4dcf1290.tar.bz2 nixlib-9358f60f94c0f41c426d23b2fd85295e4dcf1290.tar.lz nixlib-9358f60f94c0f41c426d23b2fd85295e4dcf1290.tar.xz nixlib-9358f60f94c0f41c426d23b2fd85295e4dcf1290.tar.zst nixlib-9358f60f94c0f41c426d23b2fd85295e4dcf1290.zip | |
taffybar: fix build
Closes https://github.com/NixOS/nixpkgs/issues/38531.
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7b4425869b17..a3efc1e373b5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -882,9 +882,6 @@ self: super: { # Needs QuickCheck <2.10, HUnit <1.6 and base <4.10 pointfree = doJailbreak super.pointfree; - # Needs time<1.7 - taffybar = doJailbreak super.taffybar; - # Needs tasty-quickcheck ==0.8.*, which we don't have. cryptohash-sha256 = doJailbreak super.cryptohash-sha256; cryptohash-sha1 = doJailbreak super.cryptohash-sha1; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index f336e8126f0e..ef1ebe881f54 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -144,6 +144,7 @@ self: super: builtins.intersectAttrs super { gtk = disableHardening (addPkgconfigDepend (addBuildTool super.gtk self.gtk2hs-buildtools) pkgs.gtk2) ["fortify"]; gtksourceview2 = addPkgconfigDepend super.gtksourceview2 pkgs.gtk2; gtk-traymanager = addPkgconfigDepend super.gtk-traymanager pkgs.gtk3; + taffybar = (addPkgconfigDepend super.taffybar pkgs.gtk3).override { dbus = self.dbus_1_0_1; }; # Need WebkitGTK, not just webkit. webkit = super.webkit.override { webkit = pkgs.webkitgtk24x-gtk2; }; |