diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2017-06-28 13:54:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-28 13:54:38 +0200 |
| commit | 8a62a9b064ed52da5ab2fd9520cdd218ce4445cb (patch) | |
| tree | 3091c1b3830ba15792487a68db57d05a9fa6b715 /pkgs/development/haskell-modules/configuration-nix.nix | |
| parent | a6cf6367e2abd9610da804286cc6c439d79717db (diff) | |
| parent | b7ccf27229d9479e5cea2f2d2c2b06477d9e3049 (diff) | |
| download | nixlib-8a62a9b064ed52da5ab2fd9520cdd218ce4445cb.tar nixlib-8a62a9b064ed52da5ab2fd9520cdd218ce4445cb.tar.gz nixlib-8a62a9b064ed52da5ab2fd9520cdd218ce4445cb.tar.bz2 nixlib-8a62a9b064ed52da5ab2fd9520cdd218ce4445cb.tar.lz nixlib-8a62a9b064ed52da5ab2fd9520cdd218ce4445cb.tar.xz nixlib-8a62a9b064ed52da5ab2fd9520cdd218ce4445cb.tar.zst nixlib-8a62a9b064ed52da5ab2fd9520cdd218ce4445cb.zip | |
Merge pull request #26125 from volth/webkitgtk-naming
rename webkitgtk24x⇒webkitgtk24x-gtk3; webkitgtk2⇒webkitgtk24x-gtk2
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-nix.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 584ea5eb71df..89827e8c9d9e 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -129,8 +129,8 @@ self: super: builtins.intersectAttrs super { gtksourceview2 = addPkgconfigDepend super.gtksourceview2 pkgs.gtk2; # Need WebkitGTK, not just webkit. - webkit = super.webkit.override { webkit = pkgs.webkitgtk2; }; - websnap = super.websnap.override { webkit = pkgs.webkitgtk24x; }; + webkit = super.webkit.override { webkit = pkgs.webkitgtk24x-gtk2; }; + websnap = super.websnap.override { webkit = pkgs.webkitgtk24x-gtk3; }; hs-mesos = overrideCabal super.hs-mesos (drv: { # Pass _only_ mesos; the correct protobuf is propagated. |