From d4bfeb31ecfc168a4c7dee860923ae2e85350856 Mon Sep 17 00:00:00 2001 From: Jack Kavanagh Date: Fri, 30 Aug 2024 23:04:54 +0200 Subject: [PATCH] shell.nix -> flake.nix (#7892) * init * lock file --- flake.lock | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 31 +++++++++++++++++++++++++++++ shell.nix | 12 ----------- 3 files changed, 89 insertions(+), 12 deletions(-) create mode 100644 flake.lock create mode 100644 flake.nix delete mode 100644 shell.nix diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000000..84dfacdd6c --- /dev/null +++ b/flake.lock @@ -0,0 +1,58 @@ +{ + "nodes": { + "electron-31-nixpkgs": { + "locked": { + "lastModified": 1724146343, + "narHash": "sha256-SLB5mmhHGLhb7npka7lPrIwymuOAHrsLblkWImLh2HE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "a04eac9c5aa7f82e02d6e9e0b203b6eb5704c141", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "a04eac9c5aa7f82e02d6e9e0b203b6eb5704c141", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1724855419, + "narHash": "sha256-WXHSyOF4nBX0cvHN3DfmEMcLOVdKH6tnMk9FQ8wTNRc=", + "path": "/nix/store/s6d8irfyp66lvy9kapbfp2ass36c8lfl-source", + "rev": "ae2fc9e0e42caaf3f068c1bfdc11c71734125e06", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "node-20-16-nixpkgs": { + "locked": { + "lastModified": 1723649821, + "narHash": "sha256-1NHEc1dRGObdqqc4hXLIN3J62U68lOv/stpDvrLPzxY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "8a977702729f2d763adc3e214513d517dcb94d9b", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "8a977702729f2d763adc3e214513d517dcb94d9b", + "type": "github" + } + }, + "root": { + "inputs": { + "electron-31-nixpkgs": "electron-31-nixpkgs", + "nixpkgs": "nixpkgs", + "node-20-16-nixpkgs": "node-20-16-nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000000..205e2819cb --- /dev/null +++ b/flake.nix @@ -0,0 +1,31 @@ +{ + inputs = { + electron-31-nixpkgs.url = "github:nixos/nixpkgs/a04eac9c5aa7f82e02d6e9e0b203b6eb5704c141"; + node-20-16-nixpkgs.url = "github:nixos/nixpkgs/8a977702729f2d763adc3e214513d517dcb94d9b"; + }; + outputs = { self, nixpkgs, ... }@inputs: + let + forAllSystems = with nixpkgs.lib; f: foldAttrs mergeAttrs { } + (map (s: { ${s} = f s; }) systems.flakeExposed); + in + { + devShell = forAllSystems + (system: + let + pkgs = nixpkgs.legacyPackages.${system}; + in + pkgs.mkShell { + buildInputs = [ + inputs.node-20-16-nixpkgs.legacyPackages.${system}.nodejs_20 + inputs.electron-31-nixpkgs.legacyPackages.${system}.electron + ]; + + packages = [ + + ]; + ELECTRON_OVERRIDE_DIST_PATH = "${inputs.electron-31-nixpkgs.legacyPackages.${system}.electron}/bin/"; + ELECTRON_SKIP_BINARY_DOWNLOAD = 1; + LD_LIBRARY_PATH = "${pkgs.stdenv.cc.cc.lib}/lib64:$LD_LIBRARY_PATH"; + }); + }; +} diff --git a/shell.nix b/shell.nix deleted file mode 100644 index 5b3d2c403f..0000000000 --- a/shell.nix +++ /dev/null @@ -1,12 +0,0 @@ -with import { }; - -mkShell { - nativeBuildInputs = [ - nodejs_20 - electron_30 - stdenv.cc.cc.lib - ]; - LD_LIBRARY_PATH = "${stdenv.cc.cc.lib}/lib64:$LD_LIBRARY_PATH"; - ELECTRON_OVERRIDE_DIST_PATH = "${electron_30}/bin/"; - ELECTRON_SKIP_BINARY_DOWNLOAD = 1; -}