public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't build separate bin output for alex. 

It has files in /usr/share which reference the bin output.
This commit is contained in:
Nicholas Clarke 2017-08-15 14:46:00 +01:00
parent cd24744506
commit a1d78fa5bc
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -489,4 +489,7 @@ self: super: builtins.intersectAttrs super {
# Without this override, the builds lacks pkg-config. # Without this override, the builds lacks pkg-config.
opencv-extra = addPkgconfigDepend super.opencv-extra (pkgs.opencv3.override { enableContrib = true; }); 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;
} }

2
pkgs/development/haskell-modules/lib.nix
View File

@ -142,6 +142,8 @@ rec {
overrideSrc = drv: { src, version ? drv.version }: overrideSrc = drv: { src, version ? drv.version }:
overrideCabal drv (_: { inherit src version; editedCabalFile = null; }); overrideCabal drv (_: { inherit src version; editedCabalFile = null; });
hasNoBinOutput = drv: overrideCabal drv (drv: { enableSeparateBinOutput = false; });
installOutputs = drv: outputs: overrideCabal drv installOutputs = drv: outputs: overrideCabal drv
(drv: { outputsToInstall = outputs; }); (drv: { outputsToInstall = outputs; });
} }