diff options
| author | Domen Kožar <domen@dev.si> | 2019-10-14 22:03:39 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2019-10-18 22:49:18 +0200 |
| commit | 7a710693094466b0ffb857574514a6eb989825fe (patch) | |
| tree | 5100ed2045099790be9fb0768ebbae58266b9e26 /pkgs/development/haskell-modules | |
| parent | 3ca15e5fe10968297ecd9ebabf6c77f3e5f1b3d0 (diff) | |
| download | nixpkgs-7a710693094466b0ffb857574514a6eb989825fe.tar nixpkgs-7a710693094466b0ffb857574514a6eb989825fe.tar.gz nixpkgs-7a710693094466b0ffb857574514a6eb989825fe.tar.bz2 nixpkgs-7a710693094466b0ffb857574514a6eb989825fe.tar.lz nixpkgs-7a710693094466b0ffb857574514a6eb989825fe.tar.xz nixpkgs-7a710693094466b0ffb857574514a6eb989825fe.tar.zst nixpkgs-7a710693094466b0ffb857574514a6eb989825fe.zip | |
ghcide: unbreak
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 8a97cc2943f..a29db580b72 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -6940,7 +6940,6 @@ broken-packages: - ls-usb - lscabal - LslPlus - - lsp-test - lsystem - ltext - ltk diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index ffdd1134e3b..f3692d48a29 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -444,6 +444,14 @@ self: super: builtins.intersectAttrs super { [ pkgs.darwin.apple_sdk.frameworks.OpenCL ]; }); + # depends on 'hie' executable + lsp-test = dontCheck super.lsp-test; + + # tests depend on executable + ghcide = overrideCabal super.ghcide (drv: { + preCheck = ''export PATH="$PWD/dist/build/ghcide:$PATH"''; + }); + # GLUT uses `dlopen` to link to freeglut, so we need to set the RUNPATH correctly for # it to find `libglut.so` from the nix store. We do this by patching GLUT.cabal to pkg-config # depend on freeglut, which provides GHC to necessary information to generate a correct RPATH. |