mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-23 00:50:59 +00:00
haskellPackages: regenerate hackage packages after cwiid drop
This commit is contained in:
@@ -1320,7 +1320,6 @@ dont-distribute-packages:
|
||||
- Hashell
|
||||
- hashflare
|
||||
- hask-home
|
||||
- haskanoid
|
||||
- haskdeep
|
||||
- haskeem
|
||||
- haskell-admin
|
||||
|
||||
@@ -877,17 +877,6 @@ builtins.intersectAttrs super {
|
||||
"--extra-include-dirs=${pkgs.smpeg.dev}/include/smpeg"
|
||||
] super.SDL-mpeg;
|
||||
|
||||
# https://github.com/ivanperez-keera/hcwiid/pull/4
|
||||
hcwiid = overrideCabal (drv: {
|
||||
configureFlags = (drv.configureFlags or [ ]) ++ [
|
||||
"--extra-lib-dirs=${pkgs.bluez.out}/lib"
|
||||
"--extra-lib-dirs=${pkgs.cwiid}/lib"
|
||||
"--extra-include-dirs=${pkgs.cwiid}/include"
|
||||
"--extra-include-dirs=${pkgs.bluez.dev}/include"
|
||||
];
|
||||
prePatch = ''sed -i -e "/Extra-Lib-Dirs/d" -e "/Include-Dirs/d" "hcwiid.cabal"'';
|
||||
}) super.hcwiid;
|
||||
|
||||
# cabal2nix doesn't pick up some of the dependencies.
|
||||
ginsu =
|
||||
let
|
||||
|
||||
@@ -309381,7 +309381,6 @@ self: {
|
||||
];
|
||||
description = "A breakout game written in Yampa using SDL";
|
||||
license = "unknown";
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
mainProgram = "haskanoid";
|
||||
}
|
||||
) { };
|
||||
@@ -325423,7 +325422,7 @@ self: {
|
||||
)
|
||||
{
|
||||
bluetooth = null;
|
||||
inherit (pkgs) cwiid;
|
||||
cwiid = null;
|
||||
};
|
||||
|
||||
hdaemonize = callPackage (
|
||||
|
||||
Reference in New Issue
Block a user