nixfmt all the nix source files

This commit is contained in:
Brian Hicks 2021-07-20 08:23:29 -05:00
parent fc36b67fba
commit ebf0e29dac
2 changed files with 39 additions and 57 deletions

View File

@ -3,11 +3,7 @@
let
version = "0.8.0";
osName =
if pkgs.stdenv.isDarwin then
"macos"
else
"linux";
osName = if pkgs.stdenv.isDarwin then "macos" else "linux";
splitSystem = builtins.split "-" builtins.currentSystem;
arch = builtins.elemAt splitSystem 0;
@ -16,19 +12,16 @@ let
archiveName = "zig-${osName}-${arch}-${version}";
# If you're system is not aarch64, we assume it's x86_64
sha256 =
if pkgs.stdenv.isDarwin then
if isAarch64 then
"b32d13f66d0e1ff740b3326d66a469ee6baddbd7211fa111c066d3bd57683111"
else
"279f9360b5cb23103f0395dc4d3d0d30626e699b1b4be55e98fd985b62bc6fbe"
sha256 = if pkgs.stdenv.isDarwin then
if isAarch64 then
"b32d13f66d0e1ff740b3326d66a469ee6baddbd7211fa111c066d3bd57683111"
else
if isAarch64 then
"ee204ca2c2037952cf3f8b10c609373a08a291efa4af7b3c73be0f2b27720470"
else
"502625d3da3ae595c5f44a809a87714320b7a40e6dff4a895b5fa7df3391d01e";
in
pkgs.stdenv.mkDerivation {
"279f9360b5cb23103f0395dc4d3d0d30626e699b1b4be55e98fd985b62bc6fbe"
else if isAarch64 then
"ee204ca2c2037952cf3f8b10c609373a08a291efa4af7b3c73be0f2b27720470"
else
"502625d3da3ae595c5f44a809a87714320b7a40e6dff4a895b5fa7df3391d01e";
in pkgs.stdenv.mkDerivation {
pname = "zig";
version = version;
src = pkgs.fetchurl {

View File

@ -1,25 +1,21 @@
{}:
{ }:
let
sources = import nix/sources.nix { };
pkgs = import sources.nixpkgs { };
darwinInputs =
with pkgs;
lib.optionals stdenv.isDarwin (
with pkgs.darwin.apple_sdk.frameworks; [
AppKit
CoreFoundation
CoreServices
CoreVideo
Foundation
Metal
Security
]
);
darwinInputs = with pkgs;
lib.optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [
AppKit
CoreFoundation
CoreServices
CoreVideo
Foundation
Metal
Security
]);
linuxInputs =
with pkgs;
linuxInputs = with pkgs;
lib.optionals stdenv.isLinux [
valgrind
vulkan-headers
@ -37,7 +33,7 @@ let
zig = import ./nix/zig.nix { inherit pkgs; };
inputs = with pkgs;[
inputs = with pkgs; [
# build libraries
rustc
cargo
@ -64,27 +60,20 @@ let
# faster builds - see https://github.com/rtfeldman/roc/blob/trunk/BUILDING_FROM_SOURCE.md#use-lld-for-the-linker
llvmPkgs.lld
];
in
pkgs.mkShell
{
buildInputs = inputs ++ darwinInputs ++ linuxInputs;
in pkgs.mkShell {
buildInputs = inputs ++ darwinInputs ++ linuxInputs;
# Additional Env vars
LLVM_SYS_120_PREFIX = "${llvmPkgs.llvm.dev}";
LD_LIBRARY_PATH =
with pkgs;
lib.makeLibraryPath
(
[
pkg-config
stdenv.cc.cc.lib
llvmPkgs.libcxx
llvmPkgs.libcxxabi
libunwind
libffi
ncurses
zlib
]
++ linuxInputs
);
}
# Additional Env vars
LLVM_SYS_120_PREFIX = "${llvmPkgs.llvm.dev}";
LD_LIBRARY_PATH = with pkgs;
lib.makeLibraryPath ([
pkg-config
stdenv.cc.cc.lib
llvmPkgs.libcxx
llvmPkgs.libcxxabi
libunwind
libffi
ncurses
zlib
] ++ linuxInputs);
}