BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

haskellPackages.xmonad-contrib_0_17_0: mv override closer to xmonad

Browse source 
Having everything in one place is going to make this a bit more maintainable.
This commit is contained in:
sternenseemann 2021-12-01 18:10:59 +01:00
parent 36d5761b3e
commit a9fb1cb78a
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2114,9 +2114,4 @@ EOT
brick = self.brick_0_64_2; 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 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

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

@ -225,6 +225,11 @@ self: super: builtins.intersectAttrs super {
xmonad = appendPatch ./patches/xmonad-nix.patch (dontCheck super.xmonad); 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)); 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. # wxc supports wxGTX >= 3.0, but our current default version points to 2.8.
# http://hydra.cryp.to/build/1331287/log/raw # http://hydra.cryp.to/build/1331287/log/raw
wxc = (addBuildDepend self.split super.wxc).override { wxGTK = pkgs.wxGTK30; }; wxc = (addBuildDepend self.split super.wxc).override { wxGTK = pkgs.wxGTK30; };