Skip to content

Commit afa8b33

Browse files
committed
Fix .flags deprecation
1 parent 918f788 commit afa8b33

File tree

2 files changed

+18
-10
lines changed

2 files changed

+18
-10
lines changed

modules/common-wrapper.nix

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,14 @@ in
3434
type = flagsType;
3535
default = [ ];
3636
description = "(Deprecated) Flags passed before any arguments to the wrapped program. Use prependFlags instead";
37-
apply = throw "The option `${lib.showOption [ "flags" ]}' used in ${lib.showFiles options.flags.files} is deprecated. Use `${
38-
lib.showOption [ "prependFlags" ]
39-
}' instead.";
37+
apply =
38+
flags:
39+
if flags == [ ] then
40+
[ ]
41+
else
42+
throw "The option `${lib.showOption [ "flags" ]}' used in ${lib.showFiles options.flags.files} is deprecated. Use `${
43+
lib.showOption [ "prependFlags" ]
44+
}' instead.";
4045
};
4146
prependFlags = mkOption {
4247
type = flagsType;

tests/multi.nix

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ wrapper-manager.lib {
1515
basePackage = pkgs.discord;
1616

1717
env.NIXOS_OZONE_WL.value = "1";
18+
prependFlags = [
19+
"--disable-gpu"
20+
];
1821
};
1922

2023
wrappers.hello = {
@@ -36,13 +39,13 @@ wrapper-manager.lib {
3639
basePackage = pkgs.zellij;
3740
};
3841

39-
# wrappers.hello-bad = {
40-
# basePackage = pkgs.hello;
41-
# flags = [
42-
# "-g"
43-
# "g"
44-
# ];
45-
# };
42+
wrappers.hello-bad = {
43+
basePackage = pkgs.hello;
44+
flags = [
45+
"-g"
46+
"g"
47+
];
48+
};
4649

4750
wrappers.neofetch = {
4851
basePackage = pkgs.neofetch.override { x11Support = false; };

0 commit comments

Comments
 (0)