From 353e276937a4e3a742b94df3e8f5a69ecac1ddb8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Feb 2015 12:24:13 +0100 Subject: [PATCH] haskell-mikmod: fix build --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ pkgs/development/haskell-modules/lib.nix | 3 +++ 2 files changed, 6 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 67384e321d5..4a82eb51785 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -412,6 +412,9 @@ self: super: { # Nix-specific workaround xmonad = appendPatch super.xmonad ./xmonad-nix.patch; + # https://github.com/evanrinehart/mikmod/issues/1 + mikmod = addExtraLibrary super.mikmod pkgs.libmikmod; + } // { # Not on Hackage. diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 2989881af69..8337411e1ad 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -25,6 +25,9 @@ rec { addBuildTool = drv: x: addBuildTools drv [x]; 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]; addBuildDepends = drv: xs: overrideCabal drv (drv: { buildDepends = (drv.buildDepends or []) ++ xs; });