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

nix: split out devshells to allow adding extra packages #519

Merged
merged 1 commit into from
Oct 24, 2024
Merged

nix: split out devshells to allow adding extra packages #519

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
93 changes: 57 additions & 36 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
flake-utils.lib.eachSystem [ flake-utils.lib.system.x86_64-linux ] (
system:
let
defaultLlvmVersion = 16;
pkgs = import nixpkgs { inherit system; };

drgnSrc = pkgs.fetchFromGitHub {
Expand All @@ -32,14 +33,16 @@
};

mkOidPackage =
llvmPackages:
with pkgs;
llvmVersion:
let
llvmPackages = pkgs."llvmPackages_${toString llvmVersion}";
in
llvmPackages.stdenv.mkDerivation rec {
name = "oid";

src = self;

nativeBuildInputs = [
nativeBuildInputs = with pkgs; [
autoconf
automake
bison
Expand All @@ -57,36 +60,38 @@
glibcLocales
];

buildInputs = [
llvmPackages.libclang
llvmPackages.llvm
llvmPackages.openmp

boost
bzip2
curl
double-conversion
elfutils
flex
folly
folly.fmt
gflags
glog
gtest
icu
jemalloc
libarchive
libmicrohttpd
liburing
libxml2
lzma
msgpack
range-v3
rocksdb_8_11
sqlite
tomlplusplus
zstd
];
buildInputs =
(with llvmPackages; [
llvmPackages.libclang
llvmPackages.llvm
llvmPackages.openmp
])
++ (with pkgs; [
boost
bzip2
curl
double-conversion
elfutils
flex
folly
folly.fmt
gflags
glog
gtest
icu
jemalloc
libarchive
libmicrohttpd
liburing
libxml2
lzma
msgpack
range-v3
rocksdb_8_11
sqlite
tomlplusplus
zstd
]);

cmakeFlags = [
"-Ddrgn_SOURCE_DIR=${drgnSrc}"
Expand All @@ -95,13 +100,29 @@

outputs = [ "out" ];
};

mkOidDevShell =
llvmVersion:
let
llvmPackages = pkgs."llvmPackages_${toString llvmVersion}";
in
pkgs.mkShell.override { stdenv = llvmPackages.stdenv; } {
inputsFrom = [ self.packages.${system}."oid-llvm${toString llvmVersion}" ];
buildInputs = [ ];
};
in
{
packages = rec {
default = oid-llvm16;
default = self.packages.${system}."oid-llvm${toString defaultLlvmVersion}";

oid-llvm15 = mkOidPackage 15;
oid-llvm16 = mkOidPackage 16;
};
devShells = rec {
default = self.devShells.${system}."oid-llvm${toString defaultLlvmVersion}";

oid-llvm15 = mkOidPackage pkgs.llvmPackages_15;
oid-llvm16 = mkOidPackage pkgs.llvmPackages_16;
oid-llvm15 = mkOidDevShell 15;
oid-llvm16 = mkOidDevShell 16;
};

apps.default = {
Expand Down
Loading