From 4730ae2ea6012ed3f12ac02a4dce07370fee3beb Mon Sep 17 00:00:00 2001 From: Alejandro Soto Date: Tue, 25 Oct 2022 12:17:39 -0600 Subject: Move flake.nix to nix/ subdirectory --- flake.lock | 24 ------------------------ flake.nix | 21 --------------------- nix/flake.lock | 24 ++++++++++++++++++++++++ nix/flake.nix | 21 +++++++++++++++++++++ 4 files changed, 45 insertions(+), 45 deletions(-) delete mode 100644 flake.lock delete mode 100644 flake.nix create mode 100644 nix/flake.lock create mode 100644 nix/flake.nix diff --git a/flake.lock b/flake.lock deleted file mode 100644 index 3b5c57f..0000000 --- a/flake.lock +++ /dev/null @@ -1,24 +0,0 @@ -{ - "nodes": { - "nixpkgs": { - "locked": { - "lastModified": 1661700591, - "narHash": "sha256-NZa+z+TJC+Hk+87+LKkjFFmBn4GyMVEPcWFXFU+aTkU=", - "path": "/nix/store/6v8l94l7zssb6l87azm0gcz9bjwa8lhw-source", - "rev": "16236dd7e33ba4579ccd3ca8349396b2f9c960fe", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "root": { - "inputs": { - "nixpkgs": "nixpkgs" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/flake.nix b/flake.nix deleted file mode 100644 index f4e1616..0000000 --- a/flake.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - outputs = { self, nixpkgs }: let - pkgs = nixpkgs.legacyPackages."x86_64-linux"; - in { - devShells."x86_64-linux".default = pkgs.mkShell { - buildInputs = [ pkgs.SDL2 ]; - nativeBuildInputs = [ - pkgs.gcc-arm-embedded - pkgs.gdb - pkgs.pkg-config - (pkgs.python39.withPackages (py: [ py.numpy py.pillow ])) - ]; - - shellHook = '' - export MAKEFLAGS="AR=gcc-ar" - export CXXFLAGS="-O3 -flto $(pkg-config --cflags sdl2)" - export LDFLAGS="-O3 -flto $(pkg-config --libs sdl2)" - ''; - }; - }; -} diff --git a/nix/flake.lock b/nix/flake.lock new file mode 100644 index 0000000..3b5c57f --- /dev/null +++ b/nix/flake.lock @@ -0,0 +1,24 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1661700591, + "narHash": "sha256-NZa+z+TJC+Hk+87+LKkjFFmBn4GyMVEPcWFXFU+aTkU=", + "path": "/nix/store/6v8l94l7zssb6l87azm0gcz9bjwa8lhw-source", + "rev": "16236dd7e33ba4579ccd3ca8349396b2f9c960fe", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/nix/flake.nix b/nix/flake.nix new file mode 100644 index 0000000..f4e1616 --- /dev/null +++ b/nix/flake.nix @@ -0,0 +1,21 @@ +{ + outputs = { self, nixpkgs }: let + pkgs = nixpkgs.legacyPackages."x86_64-linux"; + in { + devShells."x86_64-linux".default = pkgs.mkShell { + buildInputs = [ pkgs.SDL2 ]; + nativeBuildInputs = [ + pkgs.gcc-arm-embedded + pkgs.gdb + pkgs.pkg-config + (pkgs.python39.withPackages (py: [ py.numpy py.pillow ])) + ]; + + shellHook = '' + export MAKEFLAGS="AR=gcc-ar" + export CXXFLAGS="-O3 -flto $(pkg-config --cflags sdl2)" + export LDFLAGS="-O3 -flto $(pkg-config --libs sdl2)" + ''; + }; + }; +} -- cgit v1.2.3