diff options
| author | Nicholas Clarke <nick@topos.org.uk> | 2017-08-15 14:46:00 +0100 |
|---|---|---|
| committer | Nicholas Clarke <nick@topos.org.uk> | 2017-09-04 12:35:57 +0100 |
| commit | a1d78fa5bc92d4946a9c8ecdcf71ad548e11cb0b (patch) | |
| tree | 0468b7e1ad1c35d314a99a2cd84c1b02878330d5 /pkgs/development/haskell-modules | |
| parent | cd24744506cbf0b9c68c5dd8b731a46b8e13f84c (diff) | |
| download | nixlib-a1d78fa5bc92d4946a9c8ecdcf71ad548e11cb0b.tar nixlib-a1d78fa5bc92d4946a9c8ecdcf71ad548e11cb0b.tar.gz nixlib-a1d78fa5bc92d4946a9c8ecdcf71ad548e11cb0b.tar.bz2 nixlib-a1d78fa5bc92d4946a9c8ecdcf71ad548e11cb0b.tar.lz nixlib-a1d78fa5bc92d4946a9c8ecdcf71ad548e11cb0b.tar.xz nixlib-a1d78fa5bc92d4946a9c8ecdcf71ad548e11cb0b.tar.zst nixlib-a1d78fa5bc92d4946a9c8ecdcf71ad548e11cb0b.zip | |
Don't build separate bin output for alex.
It has files in /usr/share which reference the bin output.
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/lib.nix | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 36f5f28f2f81..83ed62c7de06 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -489,4 +489,7 @@ self: super: builtins.intersectAttrs super { # Without this override, the builds lacks pkg-config. opencv-extra = addPkgconfigDepend super.opencv-extra (pkgs.opencv3.override { enableContrib = true; }); + # Alex has some weird files in /usr/share that create a cyclic ref with + # its bin dir. + alex = hasNoBinOutput super.alex; } diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 518c3c82e6cd..fbfd5ae6b94a 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -142,6 +142,8 @@ rec { overrideSrc = drv: { src, version ? drv.version }: overrideCabal drv (_: { inherit src version; editedCabalFile = null; }); + hasNoBinOutput = drv: overrideCabal drv (drv: { enableSeparateBinOutput = false; }); + installOutputs = drv: outputs: overrideCabal drv (drv: { outputsToInstall = outputs; }); } |