movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-09 12:05:50 +03:00
Code Activity

Merge master into staging-next

Browse source
This commit is contained in:
nixpkgs-ci[bot] 2025-04-27 12:05:44 +00:00 • committed by GitHub
commit a821261015
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
124 changed files with 908 additions and 483 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/config/stub-ld.nix
View file

@ -42,10 +42,7 @@ let
$CC -Os main.c -o $out
'';
pkgs32 = pkgs.pkgsi686Linux;
stub-ld = stub-ld-for pkgs message;
stub-ld32 = stub-ld-for pkgs32 message;
in
{
options = {
@ -65,7 +62,6 @@ in
config = mkIf cfg.enable {
environment.ldso = mkDefault stub-ld;
environment.ldso32 = mkIf pkgs.stdenv.hostPlatform.isx86_64 (mkDefault stub-ld32);
};
meta.maintainers = with lib.maintainers; [ tejing ];

9
nixos/modules/programs/wayland/waybar.nix
View file

@ -16,13 +16,20 @@ in
// lib.mkOption {
apply = pkg: pkg.override { systemdSupport = true; };
};
systemd.target = lib.mkOption {
type = lib.types.str;
description = ''
The systemd target that will automatically start the Waybar service.
'';
default = "graphical-session.target";
};
};
config = lib.mkIf cfg.enable {
environment.systemPackages = [ cfg.package ];
systemd = {
packages = [ cfg.package ];
user.services.waybar.wantedBy = [ "graphical-session.target" ];
user.services.waybar.wantedBy = [ cfg.systemd.target ];
};
};