Update zig devShell
This commit is contained in:
parent
fd1025cfb6
commit
3c4c467c6a
3 changed files with 46 additions and 34 deletions
16
flake.lock
generated
16
flake.lock
generated
|
|
@ -1,5 +1,20 @@
|
|||
{
|
||||
"nodes": {
|
||||
"flake-utils": {
|
||||
"locked": {
|
||||
"lastModified": 1631561581,
|
||||
"narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1633296426,
|
||||
|
|
@ -16,6 +31,7 @@
|
|||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": "nixpkgs"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
13
flake.nix
13
flake.nix
|
|
@ -1,18 +1,23 @@
|
|||
{
|
||||
description = "dotfiles";
|
||||
|
||||
outputs = { self, nixpkgs }:
|
||||
inputs.flake-utils.url = "github:numtide/flake-utils";
|
||||
|
||||
outputs = { self, nixpkgs, flake-utils }:
|
||||
flake-utils.lib.eachDefaultSystem (system:
|
||||
let
|
||||
pkgs = import nixpkgs
|
||||
{
|
||||
system = "x86_64-linux";
|
||||
system = system;
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
packages.x86_64-linux.lutris = pkgs.lutris;
|
||||
packages.lutris = pkgs.lutris;
|
||||
|
||||
devShells.zig = import ./nix/zig.nix { pkgs = pkgs; };
|
||||
|
||||
nixosConfigurations = {
|
||||
dustbowl = nixpkgs.lib.nixosSystem {
|
||||
|
|
@ -20,5 +25,5 @@
|
|||
modules = [ ./nixos/dustbowl.nix ];
|
||||
};
|
||||
};
|
||||
};
|
||||
});
|
||||
}
|
||||
|
|
|
|||
23
nix/zig.nix
23
nix/zig.nix
|
|
@ -1,22 +1,13 @@
|
|||
{ pkgs ? import <nixpkgs> {} }:
|
||||
{ pkgs }:
|
||||
|
||||
pkgs.stdenv.mkDerivation rec {
|
||||
version = "master";
|
||||
pname = "zig";
|
||||
|
||||
src = ./.;
|
||||
|
||||
hardeningDisable = [ "all" ];
|
||||
nativeBuildInputs = with pkgs; [ cmake ninja ];
|
||||
pkgs.mkShell {
|
||||
buildInputs = with pkgs; [
|
||||
llvmPackages_12.clang-unwrapped
|
||||
llvmPackages_12.llvm
|
||||
llvmPackages_12.lld
|
||||
cmake
|
||||
ninja
|
||||
llvmPackages_13.clang-unwrapped
|
||||
llvmPackages_13.llvm
|
||||
llvmPackages_13.lld
|
||||
libxml2
|
||||
zlib
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
export HOME=$TMPDIR;
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue