b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

taffybar: fix build

Browse source 
Closes https://github.com/NixOS/nixpkgs/issues/38531.
This commit is contained in:
Michael Alan Dorman 2018-04-09 13:43:20 -04:00 committed by Peter Simons
parent 281775bb1a
commit 9358f60f94
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -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;

1
pkgs/development/haskell-modules/configuration-nix.nix
View file

@ -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; };