nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 08:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #269955 from Linschlager/hs-hidapi

Browse Source 
haskellPackages.hidapi: fix darwin build
This commit is contained in:
Naïm Favier 2023-11-27 12:44:53 +01:00 committed by GitHub
commit 2ba415365b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/haskell-modules/configuration-darwin.nix
View File

@ -123,6 +123,14 @@ self: super: ({
__darwinAllowLocalNetworking = true;
});
hidapi =
addExtraLibraries [
darwin.apple_sdk.frameworks.AppKit
darwin.apple_sdk.frameworks.IOKit
darwin.apple_sdk.frameworks.CoreFoundation
]
(super.hidapi.override { systemd = null; });
hmatrix = addBuildDepend darwin.apple_sdk.frameworks.Accelerate super.hmatrix;
blas-hs = overrideCabal (drv: {

1
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
View File

@ -640,7 +640,6 @@ unsupported-platforms:
haskell-snake: [ platforms.darwin ]
hcwiid: [ platforms.darwin ]
HDRUtils: [ platforms.darwin ]
hidapi: [ platforms.darwin ]
hinotify-bytestring: [ platforms.darwin ]
honk: [ platforms.darwin ]
HSoM: [ platforms.darwin ]

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

@ -625,8 +625,6 @@ self: super: builtins.intersectAttrs super {
# https://github.com/haskell-fswatch/hfsnotify/issues/62
fsnotify = dontCheck super.fsnotify;
hidapi = addExtraLibrary pkgs.udev super.hidapi;
hs-GeoIP = super.hs-GeoIP.override { GeoIP = pkgs.geoipWithDatabase; };
discount = super.discount.override { markdown = pkgs.discount; };

1
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

@ -146371,7 +146371,6 @@ self: {
librarySystemDepends = [ systemd ];
description = "Haskell bindings to HIDAPI";
license = lib.licenses.mit;
badPlatforms = lib.platforms.darwin;
}) {inherit (pkgs) systemd;};
"hidden-char" = callPackage