diff options
| author | Alejandro Soto <alejandro@34project.org> | 2022-12-13 20:56:50 -0600 |
|---|---|---|
| committer | Alejandro Soto <alejandro@34project.org> | 2022-12-16 16:29:10 -0600 |
| commit | d564e3538a3654facc94bb4cd1ee021830dfcf52 (patch) | |
| tree | d9cc016ae651352f6c5e8cae1f2d4b5aaf8280ca | |
| parent | 1f94f0eb7e214bff29468bf9c39cb99520e290f2 (diff) | |
Update Nix dev shells
| -rw-r--r-- | nix/flake.nix | 80 |
1 files changed, 49 insertions, 31 deletions
diff --git a/nix/flake.nix b/nix/flake.nix index 3a291fa..dbc4e2d 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -3,41 +3,59 @@ system = "x86_64-linux"; pkgs = import nixpkgs { inherit system; config.allowUnfree = true; }; in { - devShells."${system}".default = pkgs.mkShell { - buildInputs = with pkgs; [ - ncurses - openssl - SDL2 - ]; + devShells."${system}" = with pkgs; { + default = mkShell { + buildInputs = [ + ncurses + openssl + SDL2 + ]; - nativeBuildInputs = with pkgs; [ - bc - binutils - bison - flex - gcc - gcc-arm-embedded - gdb - gnumake - gtkwave - pkg-config - (python39.withPackages (py: [ py.numpy py.pillow py.matplotlib ])) - (quartus-prime-lite.override { supportedDevices = [ "Cyclone V" ]; }) - verilator - ]; + nativeBuildInputs = [ + binutils + gcc + gcc-arm-embedded + gdb + gnumake + gtkwave + pkg-config + (python39.withPackages (py: [ py.numpy py.pillow py.matplotlib ])) + (quartus-prime-lite.override { supportedDevices = [ "Cyclone V" ]; }) + verilator + ]; - shellHook = '' - # U-Boot - export CROSS_COMPILE=arm-none-eabi- + shellHook = '' + export MAKEFLAGS="AR=gcc-ar" + export CXXFLAGS="-O3 -flto $(pkg-config --cflags sdl2 ncursesw)" + export LDFLAGS="-O3 -flto $(pkg-config --libs sdl2 ncursesw)" - export MAKEFLAGS="AR=gcc-ar" - export CXXFLAGS="-O3 -flto $(pkg-config --cflags sdl2 ncursesw)" - export LDFLAGS="-O3 -flto $(pkg-config --libs sdl2 ncursesw)" + # <https://discourse.nixos.org/t/fonts-in-nix-installed-packages-on-a-non-nixos-system/5871/7> + export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" + export FONTCONFIG_FILE="${fontconfig.out}/etc/fonts/fonts.conf" + ''; + }; - # <https://discourse.nixos.org/t/fonts-in-nix-installed-packages-on-a-non-nixos-system/5871/7> - export LOCALE_ARCHIVE="${pkgs.glibcLocales}/lib/locale/locale-archive" - export FONTCONFIG_FILE="${pkgs.fontconfig.out}/etc/fonts/fonts.conf" - ''; + kbuild = mkShell { + buildInputs = [ + ncurses + ]; + + nativeBuildInputs = [ + bc + bison + flex + gcc + gcc-arm-embedded + gnumake + openssl # Splash de u-boot + ubootTools + ]; + + shellHook = '' + export CROSS_COMPILE=arm-none-eabi- + export MAKEFLAGS="ARCH=arm O=build/taller LOADADDR=0x8000" + ''; + }; }; }; } |