Skip to content

flake: drop flake-utils, refactor #7368

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

Merged
merged 2 commits into from
Mar 19, 2025
Merged

flake: drop flake-utils, refactor #7368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b99bc1
flake: drop flake-utils, refactor
bloxx12 Feb 27, 2025
ae9cb60
flake: bump MSRV to 1.82
bloxx12 Mar 5, 2025
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
22 changes: 2 additions & 20 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

81 changes: 42 additions & 39 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,29 @@
{
inputs = {
nixpkgs.url = "github:nixos/nixpkgs";
flake-utils.url = "github:numtide/flake-utils";

# <https://github.com/nix-systems/nix-systems>
systems.url = "github:nix-systems/default";
};

outputs = {
self,
nixpkgs,
flake-utils,
}:
flake-utils.lib.eachDefaultSystem (system: let
pkgs = nixpkgs.legacyPackages.${system};
libselinuxPath = with pkgs;
lib.makeLibraryPath [
libselinux
];
libaclPath = with pkgs;
lib.makeLibraryPath [
acl
];
outputs = inputs: let
inherit (inputs.nixpkgs) lib legacyPackages;
eachSystem = lib.genAttrs (import inputs.systems);
pkgsFor = legacyPackages;
in {
devShells = eachSystem (
system: let
libselinuxPath = with pkgsFor.${system};
lib.makeLibraryPath [
libselinux
];

build_deps = with pkgs; [
libaclPath = with pkgsFor.${system};
lib.makeLibraryPath [
acl
];

build_deps = with pkgsFor.${system}; [
clang
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should probably use clangStdenv for this

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why? What is the difference? I guess it includes more stuff which might be needed?

llvmPackages.bintools
rustup
Expand All @@ -31,7 +34,8 @@
# debugging
gdb
];
gnu_testing_deps = with pkgs; [

gnu_testing_deps = with pkgsFor.${system}; [
autoconf
automake
bison
Expand All @@ -40,32 +44,31 @@
gettext
texinfo
];
in {
devShell = pkgs.mkShell {
buildInputs = build_deps ++ gnu_testing_deps;
in {
default = pkgsFor.${system}.pkgs.mkShell {
packages = build_deps ++ gnu_testing_deps;

RUSTC_VERSION = "1.75";
LIBCLANG_PATH = pkgs.lib.makeLibraryPath [pkgs.llvmPackages_latest.libclang.lib];
shellHook = ''
export PATH=$PATH:''${CARGO_HOME:-~/.cargo}/bin
export PATH=$PATH:''${RUSTUP_HOME:-~/.rustup}/toolchains/$RUSTC_VERSION-x86_64-unknown-linux-gnu/bin/
'';
RUSTC_VERSION = "1.82";
LIBCLANG_PATH = pkgsFor.${system}.lib.makeLibraryPath [pkgsFor.${system}.llvmPackages_latest.libclang.lib];
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible to use rustPlatform.bindgenHook instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No idea, how would I go about doing that?

shellHook = ''
export PATH=$PATH:''${CARGO_HOME:-~/.cargo}/bin
export PATH=$PATH:''${RUSTUP_HOME:-~/.rustup}/toolchains/$RUSTC_VERSION-x86_64-unknown-linux-gnu/bin/
'';

SELINUX_INCLUDE_DIR = ''${pkgs.libselinux.dev}/include'';
SELINUX_LIB_DIR = libselinuxPath;
SELINUX_STATIC = "0";
SELINUX_INCLUDE_DIR = ''${pkgsFor.${system}.libselinux.dev}/include'';
SELINUX_LIB_DIR = libselinuxPath;
SELINUX_STATIC = "0";

# Necessary to build GNU.
LDFLAGS = ''-L ${libselinuxPath} -L ${libaclPath}'';
# Necessary to build GNU.
LDFLAGS = ''-L ${libselinuxPath} -L ${libaclPath}'';

# Add precompiled library to rustc search path
RUSTFLAGS =
(builtins.map (a: ''-L ${a}/lib'') [
])
++ [
# Add precompiled library to rustc search path
RUSTFLAGS = [
''-L ${libselinuxPath}''
''-L ${libaclPath}''
];
};
});
};
}
);
};
}
Loading