diff options
Diffstat (limited to 'devShells')
| -rw-r--r-- | devShells/apo.nix | 4 | ||||
| -rw-r--r-- | devShells/c.nix | 26 | ||||
| -rw-r--r-- | devShells/default.nix | 2 |
3 files changed, 14 insertions, 18 deletions
diff --git a/devShells/apo.nix b/devShells/apo.nix index a800557..07ed91b 100644 --- a/devShells/apo.nix +++ b/devShells/apo.nix @@ -11,8 +11,10 @@ in pkgs.buildPackages.mkShell { packages = with pkgs; [ qtrvsim - glibc.static + #glibc.static riscvPkgs.buildPackages.gcc + pkgsCross.armv7l-hf-multiplatform.buildPackages.gcc + pkgsCross.armv7l-hf-multiplatform.glibc.static ]; inputsFrom = [c]; meta.platforms = pkgs.lib.platforms.linux; diff --git a/devShells/c.nix b/devShells/c.nix index 5798129..9a2db98 100644 --- a/devShells/c.nix +++ b/devShells/c.nix @@ -46,22 +46,16 @@ pkgs.mkShell { libffi.dev # Qt - #qt6.qttools - #qt6.qtbase - #qt6.qttranslations - #qt6.qtserialport - #qt6.qtwebsockets - #qt6.qtcharts - #qt6.qtsvg - #qt6.qtnetworkauth - #qt6.qtwayland - #qt6.wrapQtAppsHook - libsForQt5.qtbase - libsForQt5.qttranslations - libsForQt5.qtserialport - libsForQt5.qtwebsockets - libsForQt5.qtcharts - libsForQt5.qtwayland + qt6.qttools + qt6.qtbase + qt6.qttranslations + qt6.qtserialport + qt6.qtwebsockets + qt6.qtcharts + qt6.qtsvg + qt6.qtnetworkauth + qt6.qtwayland + qt6.wrapQtAppsHook ]; meta.platforms = pkgs.lib.platforms.linux; } diff --git a/devShells/default.nix b/devShells/default.nix index d09fa70..e6a80ad 100644 --- a/devShells/default.nix +++ b/devShells/default.nix @@ -1,6 +1,6 @@ pkgs: rec { c = import ./c.nix pkgs; - musl = import ./c.nix pkgs.pkgsMusl; + #musl = import ./c.nix pkgs.pkgsMusl; #llvm = import ./c.nix pkgs.pkgsLLVM; apo = import ./apo.nix pkgs c; } |