summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-nix.nix
diff options
context:
space:
mode:
authorzowoq <59103226+zowoq@users.noreply.github.com>2020-04-28 11:09:30 +1000
committerPeter Simons <simons@cryp.to>2020-05-01 21:52:29 +0200
commite689b329c3ac130304132ccb9a4be120593f4254 (patch)
tree8b67a8b04276c0477bfcef7a4aa9a66a2f16b285 /pkgs/development/haskell-modules/configuration-nix.nix
parent278589f290a51033533844c8570e8e6aca4a9723 (diff)
downloadnixpkgs-e689b329c3ac130304132ccb9a4be120593f4254.tar
nixpkgs-e689b329c3ac130304132ccb9a4be120593f4254.tar.gz
nixpkgs-e689b329c3ac130304132ccb9a4be120593f4254.tar.bz2
nixpkgs-e689b329c3ac130304132ccb9a4be120593f4254.tar.lz
nixpkgs-e689b329c3ac130304132ccb9a4be120593f4254.tar.xz
nixpkgs-e689b329c3ac130304132ccb9a4be120593f4254.tar.zst
nixpkgs-e689b329c3ac130304132ccb9a4be120593f4254.zip
haskellPackages.hadolint: mark unbroken, remove override
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-nix.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-nix.nix5
1 files changed, 0 insertions, 5 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 817037e1e43..78e44a5ec87 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -628,11 +628,6 @@ self: super: builtins.intersectAttrs super {
   http-download = dontCheck super.http-download;
   pantry = dontCheck super.pantry;
 
-  # Hadolint wants to build a statically linked binary by default.
-  hadolint = overrideCabal super.hadolint (drv: {
-    preConfigure = "sed -i -e /ld-options:/d hadolint.cabal";
-  });
-
   # gtk2hs-buildtools is listed in setupHaskellDepends, but we
   # need it during the build itself, too.
   cairo = addBuildTool super.cairo self.buildHaskellPackages.gtk2hs-buildtools;