diff options
Diffstat (limited to '')
| -rw-r--r-- | flake.lock (renamed from nix/flake.lock) | 0 | ||||
| -rw-r--r-- | flake.nix (renamed from nix/flake.nix) | 6 | ||||
| -rw-r--r-- | nix/sd-card.nix | 39 |
3 files changed, 3 insertions, 42 deletions
diff --git a/nix/flake.lock b/flake.lock index dcf2be8..dcf2be8 100644 --- a/nix/flake.lock +++ b/flake.lock diff --git a/nix/flake.nix b/flake.nix index 25eac80..3fcb236 100644 --- a/nix/flake.nix +++ b/flake.nix @@ -40,7 +40,7 @@ bintools = prev.stdenv.cc.bintools.override { bintools = prev.stdenv.cc.bintools.bintools.overrideAttrs (prev: { patches = prev.patches ++ [ - ./gas-config-tc-arm-disable-instruction-support-check.patch + ./nix/gas-config-tc-arm-disable-instruction-support-check.patch ]; }); }; @@ -143,8 +143,8 @@ shellHook = '' export CROSS_COMPILE=arm-unknown-linux-gnueabi- export MAKEFLAGS="AR=gcc-ar" - export CXXFLAGS="-O3 -flto $(pkg-config --cflags sdl2 ncursesw)" - export LDFLAGS="-O3 -flto $(pkg-config --libs sdl2 ncursesw)" + export CXXFLAGS="$(pkg-config --cflags sdl2 ncursesw)" + export LDFLAGS="$(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" diff --git a/nix/sd-card.nix b/nix/sd-card.nix deleted file mode 100644 index d2faea8..0000000 --- a/nix/sd-card.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ ... }: { - nixpkgs = { - config.allowUnsupportedSystem = true; - - crossSystem = { - config = "armv4-unknown-linux-gnueabi"; - - gcc = { - # > Switch "--with-arch" may not be used with switch "--with-cpu" - # > make[1]: *** [Makefile:4315: configure-gcc] Error 1 - #arch = "armv4"; - - # Ver SA110 en arch/arm/mm/Kconfig, es parecido - cpu = "arm810"; - }; - - linux-kernel = { - name = "taller"; - target = "uImage"; - makeFlags = [ "LOADADDR=0x01000000" ]; - autoModules = false; - # Esto es solo para construir el toplevel del system - baseConfig = "multi_v5_defconfig"; # "multi_v4_defconfig"; - }; - }; - }; - - system.stateVersion = "22.11"; - - fileSystems."/" = { - device = "tmpfs"; - fsType = "tmpfs"; - }; - - boot.loader = { - grub.enable = false; - generic-extlinux-compatible.enable = true; - }; -} |
