Skip to content

Commit

Permalink
fix: remove clang override for stdenv and switch runner to unstable (#…
Browse files Browse the repository at this point in the history
…290)

Fix clang stdenv and switch to unstable github runner
  • Loading branch information
TheButlah authored Nov 19, 2024
1 parent 0e6c2ac commit e69450c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 deletions.
1 change: 1 addition & 0 deletions nix/machines/hil-common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ in
"${hostname}" = {
enable = true;
name = "${hostname}";
package = pkgs.unstable.github-runner;
url = "https://github.com/worldcoin/orb-os";
tokenFile = "/etc/worldcoin/secrets/gh-runner-token";
extraLabels = [ "nixos" "flashing-hil" "${hostname}" ];
Expand Down
1 change: 0 additions & 1 deletion nix/packages/hil.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
cmake
file
gnumake
libiconv # see https://stackoverflow.com/a/69732679
ninja
zig
]
12 changes: 4 additions & 8 deletions nix/shells/development.nix
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,7 @@ let
in
{
# Everything in here becomes your shell (nix develop)
devShells.default = p.native.mkShell.override
{
stdenv = p.native.clangStdenv;
}
devShells.default = p.native.mkShell
{
# Nix makes the following list of dependencies available to the development
# environment.
Expand All @@ -67,10 +64,6 @@ in
zbus-xmlgen # Used by `orb-zbus-proxies`
zig # Needed for cargo zigbuild

# This is missing on mac m1 nix, for some reason.
# see https://stackoverflow.com/a/69732679
libiconv

# Used by various rust build scripts to find system libs
# Note that this is the unwrapped version of pkg-config. By default,
# nix wraps pkg-config with a script that replaces the PKG_CONFIG_PATH
Expand All @@ -83,6 +76,9 @@ in
rustPlatform.bindgenHook # Configures bindgen to use nix clang
] ++ p.native.lib.lists.optionals p.native.stdenv.isDarwin [
macFrameworks
# This is missing on mac m1 nix, for some reason.
# see https://stackoverflow.com/a/69732679
p.native.libiconv
];

# The following sets up environment variables for the shell. These are used
Expand Down

0 comments on commit e69450c

Please sign in to comment.