Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

flake cleanup #7495

Merged
merged 1 commit into from
Jan 11, 2025
Merged

flake cleanup #7495

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
supportedSystems = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ];

templates = import ./nix/templates { };
lib = { buildRocPackage = import ./nix/buildRocPackage.nix; };
in {
inherit templates lib;
inherit templates;
lib = { buildRocPackage = import ./nix/buildRocPackage.nix; };
} //
flake-utils.lib.eachSystem supportedSystems (system:
let
Expand All @@ -49,7 +49,7 @@

# DevInputs are not necessary to build roc as a user
linuxDevInputs = with pkgs;
pkgs.lib.optionals stdenv.isLinux [
lib.optionals stdenv.isLinux [
valgrind # used in cli tests, see cli/tests/cli_tests.rs
vulkan-headers # here and below is all graphics stuff for examples/gui
vulkan-loader
Expand All @@ -66,7 +66,7 @@

# DevInputs are not necessary to build roc as a user
darwinDevInputs = with pkgs;
pkgs.lib.optionals stdenv.isDarwin
lib.optionals stdenv.isDarwin
(with pkgs.darwin.apple_sdk.frameworks; [
CoreVideo # for examples/gui
Metal # for examples/gui
Expand Down Expand Up @@ -137,9 +137,10 @@
NIX_GLIBC_PATH =
if pkgs.stdenv.isLinux then "${pkgs.glibc.out}/lib" else "";

LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath
([ pkgs.pkg-config pkgs.stdenv.cc.cc.lib pkgs.libffi pkgs.ncurses pkgs.zlib ]
++ linuxDevInputs);
LD_LIBRARY_PATH = with pkgs;
lib.makeLibraryPath
([ pkg-config stdenv.cc.cc.lib libffi ncurses zlib ]
++ linuxDevInputs);

NIXPKGS_ALLOW_UNFREE =
1; # to run the GUI examples with NVIDIA's closed source drivers
Expand Down
Loading