summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-nix.nix
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2018-07-04 13:18:21 +0200
committerGitHub <noreply@github.com>2018-07-04 13:18:21 +0200
commit6e07a3a19a56b27446fb78b3213ea1d6534d1c99 (patch)
tree5fb2a357baea42598d606f1da4c91771316393b5 /pkgs/development/haskell-modules/configuration-nix.nix
parent45f8c2ac29c28060d284318baf0565c13b2b131f (diff)
downloadnixlib-6e07a3a19a56b27446fb78b3213ea1d6534d1c99.tar
nixlib-6e07a3a19a56b27446fb78b3213ea1d6534d1c99.tar.gz
nixlib-6e07a3a19a56b27446fb78b3213ea1d6534d1c99.tar.bz2
nixlib-6e07a3a19a56b27446fb78b3213ea1d6534d1c99.tar.lz
nixlib-6e07a3a19a56b27446fb78b3213ea1d6534d1c99.tar.xz
nixlib-6e07a3a19a56b27446fb78b3213ea1d6534d1c99.tar.zst
nixlib-6e07a3a19a56b27446fb78b3213ea1d6534d1c99.zip
Revert "haskell generic-builder: Use strictDeps always"
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-nix.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-nix.nix10
1 files changed, 1 insertions, 9 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 07be62984532..54366046222d 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -53,7 +53,7 @@ self: super: builtins.intersectAttrs super {
 
   # Use the default version of mysql to build this package (which is actually mariadb).
   # test phase requires networking
-  mysql = dontCheck (addBuildTool (super.mysql.override { mysql = pkgs.mysql.connector-c; }) pkgs.mysql);
+  mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.connector-c; });
 
   # CUDA needs help finding the SDK headers and libraries.
   cuda = overrideCabal super.cuda (drv: {
@@ -516,12 +516,4 @@ self: super: builtins.intersectAttrs super {
   # Tests require a browser: https://github.com/ku-fpg/blank-canvas/issues/73
   blank-canvas = dontCheck super.blank-canvas;
   blank-canvas_0_6_2 = dontCheck super.blank-canvas_0_6_2;
-
-  # Custom setup needs pg_config
-  HDBC-postgresql = addBuildTool super.HDBC-postgresql pkgs.postgresql;
-
-  # Custom setup needs sdl-config
-  SDL = addBuildTool super.SDL pkgs.SDL;
-  neat-interpolation = addBuildTool super.neat-interpolation self.HTF;
-  hnix = addBuildTool super.hnix pkgs.nix;
 }