diff options
| author | Ralph Amissah <ralph.amissah@gmail.com> | 2021-06-18 10:26:06 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph.amissah@gmail.com> | 2021-06-18 10:26:06 -0400 |
| commit | 39e7b730e12928cffd5996e6eda138fe5ae2cbf0 (patch) | |
| tree | e0ecd7702ea3a00cf2bee7fbb478d94930296452 /org | |
| parent | nix: update things nix (diff) | |
nix: adjust, packages in shell.nix
Diffstat (limited to 'org')
| -rw-r--r-- | org/sisu_build.org | 38 |
1 files changed, 33 insertions, 5 deletions
diff --git a/org/sisu_build.org b/org/sisu_build.org index 31ecd908..cf1a7429 100644 --- a/org/sisu_build.org +++ b/org/sisu_build.org @@ -2545,7 +2545,25 @@ export RUBYLIB+=`pwd`/lib *** shell.nix TODO -#+BEGIN_SRC nix :tangle ../shell.nix +#+BEGIN_SRC nix :tangle ../shell.nix :tangle-mode (identity #o755) :shebang #!/usr/bin/env -S nix-shell --pure +{ pkgs ? import <nixpkgs> {} }: +pkgs.mkShell { + buildInputs = [( + with pkgs; [ + <<ruby_current>> + <<packages_project_relevant>> + <<packages_build>> + ] + )]; + shellHook = '' + if [[ -e ".envrc" ]]; then + source .envrc + fi + ''; +} +#+END_SRC + +#+BEGIN_SRC nix :NO-tangle ../shell.nix { pkgs ? import <nixpkgs> {} }: pkgs.mkShell { buildInputs = [ @@ -2557,12 +2575,12 @@ pkgs.mkShell { *** packages.nix **** default -#+BEGIN_SRC nix :tangle ../packages.nix +#+BEGIN_SRC nix :NO-tangle ../packages.nix { pkgs ? import <nixpkgs> {} }: with pkgs; [ - <<packages_nix>> <<ruby_current>> <<packages_project_relevant>> + <<packages_build>> ] #+END_SRC @@ -2571,9 +2589,9 @@ with pkgs; [ #+BEGIN_SRC nix :tangle ../nix/pkglst/packages_ruby_3_0.nix { pkgs ? import <nixpkgs> {} }: with pkgs; [ - <<packages_nix>> <<ruby_version_3_0>> <<packages_project_relevant>> + <<packages_build>> ] #+END_SRC @@ -2582,9 +2600,9 @@ with pkgs; [ #+BEGIN_SRC nix :tangle ../nix/pkglst/packages_ruby_2_6.nix { pkgs ? import <nixpkgs> {} }: with pkgs; [ - <<packages_nix>> <<ruby_version_2_6>> <<packages_project_relevant>> + <<packages_build>> ] #+END_SRC @@ -2649,6 +2667,16 @@ openssl #texlive-combined-full #+END_SRC +*** project misc build packages + +#+NAME: packages_build +#+BEGIN_SRC nix +nixFlakes +validatePkgConfig +jq +git +#+END_SRC + * descriptions ** README |