From 23efd52c2aa2b4ebcfee6e85faf80e69ef8624fa Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Mon, 14 Aug 2023 19:36:01 +0200 Subject: [PATCH] fix(nix): Set buildInputs for file_system dep --- flake.nix | 9 +-------- mix.nix | 12 +++++++++++- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index 9689201..6f926d9 100644 --- a/flake.nix +++ b/flake.nix @@ -123,15 +123,8 @@ packages.default = beamPackages.mixRelease { inherit pname version; - buildInputs = [ ] ++ lib.optionals isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ - CoreFoundation - CoreServices - ]) ++ lib.optionals isLinux (with pkgs; [ - inotify-tools - ]); - src = gitignoreSource ./.; - mixNixDeps = import ./mix.nix { inherit lib beamPackages; }; + mixNixDeps = import ./mix.nix { inherit pkgs lib beamPackages; }; }; process-compose."${pname}-dev" = diff --git a/mix.nix b/mix.nix index 7f99935..e6c2f65 100644 --- a/mix.nix +++ b/mix.nix @@ -1,10 +1,13 @@ -{ lib, beamPackages, overrides ? (x: y: { }) }: +{ pkgs, lib, beamPackages, overrides ? (x: y: { }) }: let buildRebar3 = lib.makeOverridable beamPackages.buildRebar3; buildMix = lib.makeOverridable beamPackages.buildMix; buildErlangMk = lib.makeOverridable beamPackages.buildErlangMk; + inherit (pkgs.stdenv) isDarwin; + inherit (pkgs.stdenv) isLinux; + self = packages // (overrides self packages); packages = with beamPackages; with self; { @@ -148,6 +151,13 @@ let sha256 = "1p0myxmnjjds8bbg69dd6fvhk8q3n7lb78zd4qvmjajnzgdmw6a1"; }; + buildInputs = [ ] ++ lib.optionals isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ + CoreFoundation + CoreServices + ]) ++ lib.optionals isLinux (with pkgs; [ + inotify-tools + ]); + beamDeps = [ ]; };