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

haskellng.jsaddle: fix on non-ghcjs

Browse source
This commit is contained in:
Nikolay Amiantov 2015-03-31 16:30:28 +03:00 committed by Peter Simons
parent 5b495bec46
commit 0e223ffafe
4 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
View file

@ -303,4 +303,10 @@ self: super: {
sed -i -e "s,<\*,<¤,g" XMonad/Actions/Volume.hs
'';
});
# Workaround for a workaround, see comment for "ghcjs" flag.
jsaddle = let jsaddle' = disableCabalFlag super.jsaddle "ghcjs";
in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3
self.webkitgtk3-javascriptcore ];
}

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

@ -120,4 +120,9 @@ self: super: {
# Newer versions require base > 4.7
gloss = super.gloss_1_9_2_1;
# Workaround for a workaround, see comment for "ghcjs" flag.
jsaddle = let jsaddle' = disableCabalFlag super.jsaddle "ghcjs";
in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3
self.webkitgtk3-javascriptcore ];
}

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

@ -85,4 +85,9 @@ self: super: {
# https://github.com/ndmitchell/extra/issues/4
extra = dontCheck super.extra;
# Workaround for a workaround, see comment for "ghcjs" flag.
jsaddle = let jsaddle' = disableCabalFlag super.jsaddle "ghcjs";
in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3
self.webkitgtk3-javascriptcore ];
}

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

@ -71,7 +71,7 @@ self: super: {
cat >> src/Reactive/Banana/Switch.hs <<EOF
instance Functor (AnyMoment Identity) where
fmap = liftM
instance Applicative (AnyMoment Identity) where
pure = return
(<*>) = ap
@ -98,4 +98,5 @@ self: super: {
ghcjs-dom = overrideCabal super.ghcjs-dom (drv: {
buildDepends = [ self.base self.mtl self.text self.ghcjs-base ];
});
}