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.
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
malcontent: 0.7.0 → 0.8.0 #93712
malcontent: 0.7.0 → 0.8.0 #93712
Conversation
Testing with { pkgs, ... }: {
environment.systemPackages = with pkgs; [
gdb
];
services.xserver = {
enable = true;
layout = "cz";
xkbVariant = "qwerty";
displayManager.gdm = {
enable = true;
debug = true;
};
desktopManager.gnome3 = {
enable = true;
debug = true;
};
};
services.openssh.enable = true;
services.flatpak.enable = true;
services.malcontent.enable = true;
users.extraUsers.jtojnar = {
isNormalUser = true;
uid = 1000;
extraGroups = [ "wheel" "networkmanager" ];
password = "a";
openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDYbOlZydfRRCGCT08wdtPcpfSrgxMc6weDx3NcWrnMpVgxnMs3HozzkaS/hbcZUocn7XbCOyaxEd1O8Fuaw4JXpUBcMetpPXkQC+bZHQ3YsZZyzVgCXFPRF88QQj0nR7YVE1AeAifjk3TCODstTxit868V1639/TVIi5y5fC0/VbYG2Lt4AadNH67bRv8YiO3iTsHQoZPKD1nxA7yANHCuw38bGTHRhsxeVD+72ThbsYSZeA9dBrzACpEdnwyXclaoyIOnKdN224tu4+4ytgH/vH/uoUfL8SmzzIDvwZ4Ba2yHhZHs5iwsVjTvLe7jjE6I1u8qY7X8ofnanfNcsmz/ jtojnar@kaiser" ];
};
users.extraUsers.kodomo = {
isNormalUser = true;
uid = 1001;
password = "b";
};
virtualisation.memorySize = 2048;
virtualisation.diskSize = 8048;
virtualisation.qemu.options = [ "-soundhw hda" ];
nixpkgs = {
overlays = [
(final: prev: {
gnome3 = prev.gnome3.overrideScope'
(gfinal: gprev: {
gnome-software = gprev.gnome-software.overrideAttrs (attrs: {
mesonFlags = (attrs.mesonFlags or []) ++ [
"-Dmalcontent=true"
];
buildInputs = (attrs.buildInputs or []) ++ [
prev.malcontent
];
});
});
})
];
};
} the malcontent-control app seems to toggle the switches without any errors but I am still able to install flatpak apps to the child used and browse web, even when I disable it. Perhaps we need to add malcontent to Flatpak or Epiphany too. Also gnome-initial-setup. |
* Update: https://gitlab.freedesktop.org/pwithnall/malcontent/-/releases/0.8.0 * Fix the separation patch. * Add `itstool` to ui (needed for building localized help). * Use `pkg-config` instead of the `pkgconfig` alias. * Fix some issues related to multiple outputs: * Make the module pass specific output to `dbus.packages` since the `dbus` NixOS module will not generate configuration with correct interface paths otherwise. * Change `malcontent-ui` package to primarily-a-program type derivation (`out`+`lib` instead of `bin`+`out`) since there are more and more `malcontent-control`-specific assets. * This also fixes the issue where application data (desktop files, icons…) were installed to `out`, which is not installed by `environment.systemPackages`/`system-path.nix`’s `buildEnv` by default when `bin` output is also present. * Make `malcontent` package install `out` output too so that `system-path.nix` links that too. It contains the AccountsService & Polkit data files. * Split the library and PAM module out of `malcontent.out` so that they are not installed with the data files. * This revealed a bug in the `gobject-introspection` setup hook.
@@ -22,14 +46,13 @@ index a6c477d..f7b2f0a 100644 | |||
+endif | |||
if get_option('ui').enabled() | |||
subdir('malcontent-control') | |||
endif | |||
-subdir('pam') | |||
+ subdir('help') |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This line is possibly upstreamable. There should definitely be no need to install help when ui is not installed.
Motivation for this change
itstool
to ui (needed for building localized help).pkg-config
instead of thepkgconfig
alias.dbus.packages
since thedbus
NixOS module will not generate configuration with correct interface paths otherwise.malcontent-ui
package to primarily-a-program type derivation (out
+lib
instead ofbin
+out
) since there are more and moremalcontent-control
-specific assets.out
, which is not installed byenvironment.systemPackages
/system-path.nix
’sbuildEnv
by default whenbin
output is also present.malcontent
package installout
output too so thatsystem-path.nix
links that too. It contains the AccountsService & Polkit data files.malcontent.out
so that they are not installed with the data files.gobject-introspection
setup hook.Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)cc @worldofpeace