nix-community/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2025-11-08 19:46:05 +01:00
Code Activity

mkFirefoxModule: fix userChrome with leading comment (#6836)

Browse source 
userChrome lines that started with a leading comment would cause an eval failure.
This commit is contained in:
Austin Horstman 2025-04-17 07:31:27 -07:00 • committed by GitHub
parent c6b75d69b6
commit c3c91dd8b4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/programs/firefox/mkFirefoxModule.nix
View file

@ -874,7 +874,11 @@ in
"chrome"
else
"chrome/userChrome.css";
sourcePath = if lib.types.path.check profile.userChrome then profile.userChrome else null;
sourcePath =
if ((i: lib.isPath i && lib.types.path.check i) profile.userChrome) then
profile.userChrome
else
null;
in
# Merge the regular profile settings with extension settings
mkMerge (

4
tests/modules/programs/firefox/profiles/userchrome/chrome/userChrome.css
View file

@ -1,3 +1,7 @@
/*
This is a simple comment that should be written inside the `chrome/userChrome.css`
*/
#urlbar {
min-width: none !important;
border: none !important;

19
tests/modules/programs/firefox/profiles/userchrome/default.nix
View file

@ -18,14 +18,17 @@ in
basic.isDefault = true;
lines = {
id = 1;
userChrome = # CSS
''
#urlbar {
min-width: none !important;
border: none !important;
outline: none !important;
}
'';
userChrome = ''
/*
This is a simple comment that should be written inside the `chrome/userChrome.css`
*/
#urlbar {
min-width: none !important;
border: none !important;
outline: none !important;
}
'';
};
path = {
id = 2;

4
tests/modules/programs/firefox/profiles/userchrome/expected-userchrome.css
View file

@ -1,3 +1,7 @@
/*
This is a simple comment that should be written inside the `chrome/userChrome.css`
*/
#urlbar {
min-width: none !important;
border: none !important;