diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-25 00:23:07 +0000 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-25 00:23:07 +0000 |
commit | 6bc456c91c6a556e905852d9a13034ed1932ea3d (patch) | |
tree | 69df19159e5e7df77ae939041f8f6e941c5ef056 /pkgs/development/haskell-modules/generic-builder.nix | |
parent | ea9a2c5ec21bf088bbdef036238fa67cdc85b073 (diff) | |
parent | 4273a6adcc9327b9dc0e09e9fe205b4861c15679 (diff) | |
download | nixpkgs-6bc456c91c6a556e905852d9a13034ed1932ea3d.tar nixpkgs-6bc456c91c6a556e905852d9a13034ed1932ea3d.tar.gz nixpkgs-6bc456c91c6a556e905852d9a13034ed1932ea3d.tar.bz2 nixpkgs-6bc456c91c6a556e905852d9a13034ed1932ea3d.tar.lz nixpkgs-6bc456c91c6a556e905852d9a13034ed1932ea3d.tar.xz nixpkgs-6bc456c91c6a556e905852d9a13034ed1932ea3d.tar.zst nixpkgs-6bc456c91c6a556e905852d9a13034ed1932ea3d.zip |
Merge remote-tracking branch 'upstream/master' into ghcjs-cross-without-cc
Diffstat (limited to 'pkgs/development/haskell-modules/generic-builder.nix')
-rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index d6966d69136..459b5085249 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -25,7 +25,7 @@ in , doBenchmark ? false , doHoogle ? true , editedCabalFile ? null -, enableLibraryProfiling ? true +, enableLibraryProfiling ? !(ghc.isGhcjs or false) , enableExecutableProfiling ? false , profilingDetail ? "exported-functions" # TODO enable shared libs for cross-compiling |