Unverified Commit 2ba41536 authored by Naïm Favier's avatar Naïm Favier Committed by GitHub
Browse files

Merge pull request #269955 from Linschlager/hs-hidapi 

haskellPackages.hidapi: fix darwin build
parents 09986a49 0a091fcc

pkgs/development/haskell-modules/configuration-darwin.nix

+8 −0
Original line number Diff line number Diff line
@@ -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: {

pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml

+0 −1
Original line number Diff line number Diff line
@@ -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 ]

pkgs/development/haskell-modules/configuration-nix.nix

+0 −2
Original line number Diff line number Diff line
@@ -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; };

pkgs/development/haskell-modules/hackage-packages.nix

+0 −1
Original line number Diff line number Diff line
@@ -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