diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 48a26cc57068..99ed27358392 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2114,9 +2114,4 @@ EOT brick = self.brick_0_64_2; }; - # Needs matching xmonad version - xmonad-contrib_0_17_0 = super.xmonad-contrib_0_17_0.override { - xmonad = self.xmonad_0_17_0; - }; - } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 45c9e7e42fe5..af2775e53ffe 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -225,6 +225,11 @@ self: super: builtins.intersectAttrs super { xmonad = appendPatch ./patches/xmonad-nix.patch (dontCheck super.xmonad); xmonad_0_17_0 = doDistribute (appendPatch ./patches/xmonad_0_17_0-nix.patch (super.xmonad_0_17_0)); + # Need matching xmonad version + xmonad-contrib_0_17_0 = super.xmonad-contrib_0_17_0.override { + xmonad = self.xmonad_0_17_0; + }; + # wxc supports wxGTX >= 3.0, but our current default version points to 2.8. # http://hydra.cryp.to/build/1331287/log/raw wxc = (addBuildDepend self.split super.wxc).override { wxGTK = pkgs.wxGTK30; };