summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorLuc Tielen <luc.tielen@kabisa.nl>2019-09-17 11:02:47 +0200
committerPeter Simons <simons@cryp.to>2019-09-18 19:36:58 +0200
commitde051787bff567367ea120539beffc03302edba3 (patch)
tree9577a7922bf3d0b4f139484a0e437f6d08d1f2eb /pkgs
parent5ea256fe5fb038327f2c6593eed1d715d69ec4e7 (diff)
downloadnixpkgs-de051787bff567367ea120539beffc03302edba3.tar
nixpkgs-de051787bff567367ea120539beffc03302edba3.tar.gz
nixpkgs-de051787bff567367ea120539beffc03302edba3.tar.bz2
nixpkgs-de051787bff567367ea120539beffc03302edba3.tar.lz
nixpkgs-de051787bff567367ea120539beffc03302edba3.tar.xz
nixpkgs-de051787bff567367ea120539beffc03302edba3.tar.zst
nixpkgs-de051787bff567367ea120539beffc03302edba3.zip
ghc881 - alex: simplify override
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix6
1 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 756ff243aa2..41925d89550 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -158,13 +158,9 @@ self: super: {
   tls = self.tls_1_5_1;
   vault = dontHaddock super.vault;
 
-  # The test suite does not know how to find the 'alex' binary.
   # TODO dont fetch patch if https://github.com/simonmar/alex/issues/140 is resolved
-  alex = overrideCabal (appendPatch super.alex (pkgs.fetchpatch {
+  alex = appendPatch super.alex (pkgs.fetchpatch {
     url = "https://github.com/simonmar/alex/commit/deaae6eddef5186bfd0e42e2c3ced39e26afa4d6.patch";
     sha256 = "1v40gmnw4lqyk271wngdwz8whpfdhmza58srbkka8icwwwrck3l5";
-  })) (drv: {
-    testSystemDepends = (drv.testSystemDepends or []) ++ [pkgs.which];
-    preCheck = ''export PATH="$PWD/dist/build/alex:$PATH"'';
   });
 }