Skip to content

Commit

Permalink
Fixing nix
Browse files Browse the repository at this point in the history
  • Loading branch information
smickovskid committed Sep 12, 2023
1 parent cf6aaad commit a7c2839
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 31 deletions.
66 changes: 51 additions & 15 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 0 additions & 11 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,13 @@
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils";
rust-overlay.url = "github:oxalica/rust-overlay";
# saber-overlay.url = "github:saber-hq/saber-overlay";
# saber-overlay.inputs.rust-overlay.follows = "rust-overlay";
# naersk.url = "github:nmattia/naersk";
};

outputs = inputs@{ self, nixpkgs, rust-overlay, flake-utils, ... }:
flake-utils.lib.eachDefaultSystem (system:
let
pkgs = import nixpkgs { inherit system; overlays = [ rust-overlay.overlays.default ]; };
# naerskLib = pkgs.callPackage naersk {
# inherit (pkgs.rust-bin.nightly.latest) rustc cargo;
# };
in rec {
# packages.program = naerskLib.buildPackage {
# pname = "program";
# root = ./.;
# };
# defaultPackage = packages.program;
devShell = pkgs.callPackage ./shell.nix {};
});
}
11 changes: 6 additions & 5 deletions shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pkgs.mkShell {
llvm_11
stdenv.cc.cc.lib
pkg-config
udev
# udev
openssl

# Solana
Expand All @@ -26,14 +26,15 @@ pkgs.mkShell {
# NodeJS + TS
nodePackages.typescript
nodePackages.typescript-language-server
nodePackages.npm
# Keep this nodejs version in sync with the version in .tool-versions please
nodejs-16_x
(yarn.override { nodejs = nodejs-16_x; })
nodejs-18_x
(yarn.override { nodejs = nodejs-18_x; })
python3
];
RUST_BACKTRACE = "1";
# https://github.com/rust-lang/rust/issues/55979
LD_LIBRARY_PATH = lib.makeLibraryPath (with pkgs; [ stdenv.cc.cc.lib ]);

LD_LIBRARY_PATH = lib.makeLibraryPath [pkgs.zlib stdenv.cc.cc.lib]; # lib64


# Avoids issues with delve
Expand Down

0 comments on commit a7c2839

Please sign in to comment.