aviallon/nixos-lib
1
0
Fork 0
mirror of https://github.com/aviallon/nixos-lib.git synced 2026-04-05 17:27:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(overlays): comment-out linux-manual override as it was causing build failures + apply nixfmt

Browse source
This commit is contained in:
Antoine Viallon 2026-03-22 21:54:37 +01:00
parent 9737dfe1c0
commit 643b136863
Signed by: aviallon
GPG key ID: 186FC35EDEB25716
1 changed files with 179 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

127
overlays.nix
View file

@ -1,4 +1,11 @@
{config, pkgs, options, lib, myLib, ...}:
{
config,
pkgs,
options,
lib,
myLib,
...
}:
with builtins;
with lib;
let
@ -8,7 +15,10 @@ in
{
imports = [
(mkRenamedOptionModule [ "aviallon" "overlays" "optimizations" ] [ "aviallon" "optimizations" "enable" ])
(mkRenamedOptionModule
[ "aviallon" "overlays" "optimizations" ]
[ "aviallon" "optimizations" "enable" ]
)
];
options.aviallon.overlays = {
@ -23,20 +33,23 @@ in
config = mkIf cfg.enable {
nix.nixPath =
# Append our nixpkgs-overlays.
[ "nixpkgs-overlays=/etc/nixos/overlays-compat/" ]
;
[ "nixpkgs-overlays=/etc/nixos/overlays-compat/" ];
nixpkgs.overlays = []
++ optional cfg.traceCallPackage (self: super: {
callPackage = path: overrides:
nixpkgs.overlays =
[ ]
++ optional cfg.traceCallPackage (
self: super: {
callPackage =
path: overrides:
let
_pkg = super.callPackage path overrides;
_name = _pkg.name or _pkg.pname or "<unknown>";
in trace "callPackage ${_name}" _pkg
;
})
++ [(self: super: {
in
trace "callPackage ${_name}" _pkg;
}
)
++ [
(self: super: {
htop = super.htop.overrideAttrs (old: {
configureFlags = old.configureFlags ++ [
"--enable-affinity"
@ -44,10 +57,14 @@ in
"--enable-capabilities"
];
nativeBuildInputs = old.nativeBuildInputs ++ (with super; [
nativeBuildInputs =
old.nativeBuildInputs
++ (with super; [
pkg-config
]);
buildInputs = old.buildInputs ++ (with super; [
buildInputs =
old.buildInputs
++ (with super; [
libcap
libunwind
libnl
@ -58,17 +75,24 @@ in
};
})
(final: prev: {
# Use our kernel for generating linux man pages
linux-manual = prev.linux-manual.override { linuxPackages_latest = config.boot.kernelPackages; };
})
# (final: prev: {
# # linux-manual requires scripts/split-man.pl from the kernel source, but
# # neither xanmod 6.19.7 nor vanilla 6.18.x ship it yet. Mark broken so
# # the build doesn't fail; man-pages and man-pages-posix still build fine.
# linux-manual = prev.linux-manual.overrideAttrs (_: {
# meta = (prev.linux-manual.meta or { }) // {
# broken = true;
# };
# });
# })
(final: prev: {
lutris-fhs =
(prev.buildFHSUserEnv {
lutris-fhs = (
prev.buildFHSUserEnv {
name = "lutris";
targetPkgs = pkgs: (with pkgs;
[
targetPkgs =
pkgs:
(with pkgs; [
glibc
bashInteractive
@ -76,10 +100,9 @@ in
lutris
gamescope
wineWowPackages.waylandFull
wineWow64Packages.waylandFull
flatpak
]
);
]);
# symlink shared assets, including icons and desktop entries
extraInstallCommands = ''
@ -87,17 +110,25 @@ in
'';
runScript = "/usr/bin/lutris";
});
}
);
})
(final: prev: let
pycharm-common = pkg:
(
final: prev:
let
pycharm-common =
pkg:
let
myIsDerivation = x: !(myLib.derivations.isBroken x);
interpreters = pkgs: filter (x: myIsDerivation x) (attrValues pkgs.pythonInterpreters);
in prev.buildFHSUserEnv rec {
in
prev.buildFHSUserEnv rec {
name = pkg.pname;
targetPkgs = pkgs: (with pkgs;
targetPkgs =
pkgs:
(
with pkgs;
[
glibc
bashInteractive
@ -107,7 +138,9 @@ in
pkg
]
++ trace "Using the following interpreters: ${toString (pkgNames (interpreters pkgs))}" (interpreters pkgs)
++ trace "Using the following interpreters: ${toString (pkgNames (interpreters pkgs))}" (
interpreters pkgs
)
);
# symlink shared assets, including icons and desktop entries
@ -117,21 +150,31 @@ in
runScript = "/usr/bin/${pkg.pname}";
};
in {
in
{
jetbrains = prev.jetbrains // {
pycharm-community-fhs = pycharm-common prev.jetbrains.pycharm-community;
pycharm-professional-fhs = pycharm-common prev.jetbrains.pycharm-professional;
clion-fhs = let
compilers = pkgs: with pkgs; with llvmPackages_17; [
clion-fhs =
let
compilers =
pkgs:
with pkgs;
with llvmPackages_17;
[
(setPrio (-9) gcc13)
(hiPrio clang)
clang-unwrapped
libcxx
];
in prev.buildFHSUserEnv rec {
in
prev.buildFHSUserEnv rec {
name = "clion";
targetPkgs = pkgs: (with pkgs;
targetPkgs =
pkgs:
(
with pkgs;
[
jetbrains.clion
(hiPrio cmake)
@ -145,16 +188,22 @@ in
extraInstallCommands = ''
ln -s "${prev.jetbrains.clion}/share" "$out/"
'';
extraOutputsToInstall = [ "include" "dev" "doc" ];
extraOutputsToInstall = [
"include"
"dev"
"doc"
];
runScript = "/usr/bin/clion";
};
};
})
}
)
];
aviallon.programs.allowUnfreeList = [
"unrar" "ark"
"unrar"
"ark"
];
};
}