natto1784/matar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

comeback(?)

Browse Source 
Signed-off-by: Amneesh Singh <natto@weirdnatto.in>
This commit is contained in:
Amneesh Singh
2024-06-11 22:46:48 +05:30
parent 174008f60c
commit 028c80f6cb
17 changed files with 97 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
nix/matar-clang.nix
View File

@@ -1,17 +1,10 @@
{ ... }: {
perSystem = { pkgs, src, ... }:
let
llvm = pkgs.llvmPackages_16;
llvm = pkgs.llvmPackages_18;
stdenv = llvm.libcxxStdenv;
libraries = with pkgs; [
((pkgs.fmt.override {
inherit stdenv;
enableShared = false;
}).overrideAttrs (oa: {
cmakeFlags = oa.cmakeFlags ++ [ "-DFMT_TEST=off" ];
})).dev
(catch2_3.override { inherit stdenv; }).out
];
in
@@ -19,7 +12,7 @@
packages.matar-clang = pkgs.callPackage ./build.nix { inherit src libraries stdenv; };
devShells.matar-clang = pkgs.callPackage ./shell.nix {
inherit libraries stdenv;
tools = with pkgs; [ (clang-tools_16.override { enableLibcxx = true; }) ];
tools = with pkgs; [ (clang-tools_18.override { enableLibcxx = true; }) ];
};
};
}

9
nix/matar.nix
View File

@@ -1,13 +1,14 @@
{ ... }: {
perSystem = { pkgs, src, ... }:
let
stdenv = pkgs.gcc14Stdenv;
libraries = with pkgs; [
(pkgs.fmt.override { enableShared = false; }).dev
catch2_3.out
(catch2_3.override { inherit stdenv; }).out
];
in
{
packages.matar = pkgs.callPackage ./build.nix { inherit src libraries; };
devShells.matar = pkgs.callPackage ./shell.nix { inherit libraries; };
packages.matar = pkgs.callPackage ./build.nix { inherit src libraries stdenv; };
devShells.matar = pkgs.callPackage ./shell.nix { inherit libraries stdenv; };
};
}