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

haskell-mikmod: fix build

Browse Source
This commit is contained in:
Peter Simons 2015-02-03 12:24:13 +01:00
parent 31ecab7b7e
commit 353e276937
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -412,6 +412,9 @@ self: super: {
# Nix-specific workaround # Nix-specific workaround
xmonad = appendPatch super.xmonad ./xmonad-nix.patch; xmonad = appendPatch super.xmonad ./xmonad-nix.patch;
# https://github.com/evanrinehart/mikmod/issues/1
mikmod = addExtraLibrary super.mikmod pkgs.libmikmod;
} // { } // {
# Not on Hackage. # Not on Hackage.

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

@ -25,6 +25,9 @@ rec {
addBuildTool = drv: x: addBuildTools drv [x]; addBuildTool = drv: x: addBuildTools drv [x];
addBuildTools = drv: xs: overrideCabal drv (drv: { buildTools = (drv.buildTools or []) ++ xs; }); addBuildTools = drv: xs: overrideCabal drv (drv: { buildTools = (drv.buildTools or []) ++ xs; });
addExtraLibrary = drv: x: addExtraLibraries drv [x];
addExtraLibraries = drv: xs: overrideCabal drv (drv: { extraLibraries = (drv.extraLibraries or []) ++ xs; });
addBuildDepend = drv: x: addBuildDepends drv [x]; addBuildDepend = drv: x: addBuildDepends drv [x];
addBuildDepends = drv: xs: overrideCabal drv (drv: { buildDepends = (drv.buildDepends or []) ++ xs; }); addBuildDepends = drv: xs: overrideCabal drv (drv: { buildDepends = (drv.buildDepends or []) ++ xs; });