nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 09:23:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate incorrect version checks from cabalJs

Browse Source
This commit is contained in:
Ryan Trinkle 2015-01-02 12:30:19 -05:00
parent ca9d370f56
commit b1e967958e
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/build-support/cabal/ghcjs.nix
View File

@ -6,14 +6,13 @@
, enableSharedLibraries ? false , enableSharedLibraries ? false
, enableSharedExecutables ? false , enableSharedExecutables ? false
, enableStaticLibraries ? true , enableStaticLibraries ? true
, enableCheckPhase ? stdenv.lib.versionOlder "7.4" ghc.version , enableCheckPhase ? true
, enableHyperlinkSource ? false , enableHyperlinkSource ? false
, extension ? (self : super : {}) , extension ? (self : super : {})
}: }:
let let
enableFeature = stdenv.lib.enableFeature; enableFeature = stdenv.lib.enableFeature;
versionOlder = stdenv.lib.versionOlder;
optional = stdenv.lib.optional; optional = stdenv.lib.optional;
optionals = stdenv.lib.optionals; optionals = stdenv.lib.optionals;
optionalString = stdenv.lib.optionalString; optionalString = stdenv.lib.optionalString;
@ -156,9 +155,9 @@ in
(enableFeature self.enableSplitObjs "split-objs") (enableFeature self.enableSplitObjs "split-objs")
(enableFeature enableLibraryProfiling "library-profiling") (enableFeature enableLibraryProfiling "library-profiling")
(enableFeature true "shared") (enableFeature true "shared")
(optional (versionOlder "7" ghc.version) (enableFeature self.enableStaticLibraries "library-vanilla")) (enableFeature self.enableStaticLibraries "library-vanilla")
(optional (versionOlder "7.4" ghc.version) (enableFeature self.enableSharedExecutables "executable-dynamic")) (enableFeature self.enableSharedExecutables "executable-dynamic")
(optional (versionOlder "7" ghc.version) (enableFeature self.doCheck "tests")) (enableFeature self.doCheck "tests")
]; ];
# GHC needs the locale configured during the Haddock phase. # GHC needs the locale configured during the Haddock phase.