Commit 736050d0 authored by Vaibhav Sagar's avatar Vaibhav Sagar

release-8.2.nix: stylistic improvements

parent 77d41237
...@@ -49,8 +49,8 @@ let ...@@ -49,8 +49,8 @@ let
]); ]);
haskellPackages = nixpkgs.haskell.packages.ghc821.override { haskellPackages = nixpkgs.haskell.packages.ghc821.override {
overrides = self: super: { overrides = self: super: {
ihaskell = nixpkgs.haskell.lib.overrideCabal ( ihaskell = nixpkgs.haskell.lib.overrideCabal (
self.callCabal2nix "ihaskell" ihaskell-src {}) (_drv: { self.callCabal2nix "ihaskell" ihaskell-src {}) (_drv: {
postPatch = let postPatch = let
# The tests seem to 'buffer' when run during nix-build, so this is # The tests seem to 'buffer' when run during nix-build, so this is
# a throw-away test to get everything running smoothly and passing. # a throw-away test to get everything running smoothly and passing.
...@@ -80,13 +80,13 @@ let ...@@ -80,13 +80,13 @@ let
static-canvas = nixpkgs.haskell.lib.doJailbreak super.static-canvas; static-canvas = nixpkgs.haskell.lib.doJailbreak super.static-canvas;
testing-feat = nixpkgs.haskell.lib.doJailbreak super.testing-feat; testing-feat = nixpkgs.haskell.lib.doJailbreak super.testing-feat;
cairo = nixpkgs.lib.overrideDerivation super.cairo (drv: { cairo = nixpkgs.lib.overrideDerivation super.cairo (_drv: {
src = "${gtk2hs}/cairo"; src = "${gtk2hs}/cairo";
}); });
glib = nixpkgs.lib.overrideDerivation super.glib (drv: { glib = nixpkgs.lib.overrideDerivation super.glib (_drv: {
src = "${gtk2hs}/glib"; src = "${gtk2hs}/glib";
}); });
pango = nixpkgs.lib.overrideDerivation super.pango (drv: { pango = nixpkgs.lib.overrideDerivation super.pango (_drv: {
src = "${gtk2hs}/pango"; src = "${gtk2hs}/pango";
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment