fix: nix configuration

Anut-py · May 16, 2024 · 182acdc · 182acdc
1 parent b324430
commit 182acdc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/default.nix b/default.nix
@@ -1,5 +1,5 @@
 { mkDerivation, base, containers, exceptions, lens, template-haskell, text, bytestring
-, lib, systemDeps, buildExamples, ...
+, linear, lib, systemDeps, buildExamples, ...
 }:
 mkDerivation {
   pname = "h-raylib";
@@ -8,7 +8,7 @@ mkDerivation {
   isLibrary = true;
   isExecutable = buildExamples;
   configureFlags = ["-fplatform-nixos"] ++ lib.optional buildExamples ["-fexamples"];
-  libraryHaskellDepends = [ base containers exceptions lens template-haskell text bytestring ];
+  libraryHaskellDepends = [ base containers exceptions lens linear template-haskell text bytestring ];
   librarySystemDepends = systemDeps;
   description = "Raylib bindings for Haskell";
   license = lib.licenses.asl20;

diff --git a/flake.nix b/flake.nix
@@ -5,7 +5,7 @@
 
   outputs = { self, nixpkgs, ... }@inputs:
     let
-      supportedSystems = [ "x86_64-linux" "x86_64-darwin" ];
+      supportedSystems = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
       forAllSystems' = nixpkgs.lib.genAttrs;
       forAllSystems = forAllSystems' supportedSystems;
 
@@ -41,7 +41,7 @@
                   sha256 = rayguiHash;
                 };
                 nativeBuildInputs = [];
-                postFixup = "mkdir -p $out/include/ && cp ./src/raygui.h $out/include/ && cp ./examples/styles/*.h $out/include/";
+                postFixup = "mkdir -p $out/include/ && cp ./src/raygui.h $out/include/ && cp ./styles/**/*.h $out/include/";
               };
               # temporary fix for CI/CD
               # TODO: remove when github.com/NixOS/nixpkgs/pull/293296 gets merged

diff --git a/h-raylib.cabal b/h-raylib.cabal
@@ -234,7 +234,7 @@ library
     , containers        >=0.6.0    && <0.7.0
     , exceptions        >=0.10.4   && <0.10.8
     , lens              >=4.0      && <5.2.4
-    , linear            >=1.23     && <1.24
+    , linear            >=1.22     && <1.23
     , template-haskell  >=2.16.0.0 && <2.22.0.0
     , text              >=2.0      && <2.2