Skip to content

[Demo] splice.nix: poor man's implementation of Gentoo-like use-flags #56109

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

Closed
oxij wants to merge 1 commit into from
Closed

[Demo] splice.nix: poor man's implementation of Gentoo-like use-flags #56109

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions pkgs/top-level/splice.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# For performance reasons, rather than uniformally splice in all cases, we only
# do so when `pkgs` and `buildPackages` are distinct. The `actuallySplice`
# parameter there the boolean value of that equality check.
lib: pkgs: actuallySplice:
lib: config: pkgs: actuallySplice:

let

Expand Down Expand Up @@ -126,9 +126,9 @@ in
# `newScope' for sets of packages in `pkgs' (see e.g. `gnome' below).
callPackage = pkgs.newScope {};

callPackages = lib.callPackagesWith splicedPackagesWithXorg;
callPackages = lib.callPackagesWith (splicedPackagesWithXorg // (config.poorMansUseFlags or {}));

newScope = extra: lib.callPackageWith (splicedPackagesWithXorg // extra);
newScope = extra: lib.callPackageWith (splicedPackagesWithXorg // (config.poorMansUseFlags or {}) // extra);

# Haskell package sets need this because they reimplement their own
# `newScope`.
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/stage.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ let
inherit (hostPlatform) system;
};

splice = self: super: import ./splice.nix lib self (buildPackages != null);
splice = self: super: import ./splice.nix lib config self (buildPackages != null);

allPackages = self: super:
let res = import ./all-packages.nix
Expand Down