public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into ghcjs-old

This commit is contained in:
Ryan Trinkle 2014-08-17 22:05:16 -04:00
parent 50275ff2ee 632ccf8bc6
commit 1a0e674694
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/haskell/snap/server.nix
View File

@ -1,7 +1,7 @@
{ cabal, attoparsec, attoparsecEnumerator, blazeBuilder { cabal, attoparsec, attoparsecEnumerator, blazeBuilder
, blazeBuilderEnumerator, caseInsensitive, enumerator , blazeBuilderEnumerator, caseInsensitive, enumerator
, MonadCatchIOTransformers, mtl, network, snapCore, text, time , MonadCatchIOTransformers, mtl, network, snapCore, text, time
, unixCompat , unixCompat, HsOpenSSL, useOpenssl ? false
}: }:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
@ -12,7 +12,8 @@ cabal.mkDerivation (self: {
attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
caseInsensitive enumerator MonadCatchIOTransformers mtl network caseInsensitive enumerator MonadCatchIOTransformers mtl network
snapCore text time unixCompat snapCore text time unixCompat
]; ] ++ self.stdenv.lib.optional useOpenssl HsOpenSSL;
configureFlags = [ ] ++ self.stdenv.lib.optional useOpenssl "-fopenssl";
meta = { meta = {
homepage = "http://snapframework.com/"; homepage = "http://snapframework.com/";
description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework"; description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework";