Skip to content
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

Jump to bottom

treewide: remove multiArch=false and wrong usage of extraPkgs #279260

Merged
merged 3 commits into from
May 14, 2024
Merged

treewide: remove multiArch=false and wrong usage of extraPkgs #279260

merged 3 commits into from
May 14, 2024

Commits on May 13, 2024

  1. treewide: remove multiArch=false from buildFHSEnv usages 

    Cleanup after the work of NixOS#240860.
Also preventing new packages to copy from outdated ones.
    @SuperSamus
    SuperSamus committed May 13, 2024
    Configuration menu
    Copy the full SHA
    bea50e5 View commit details
    Browse the repository at this point in the history

  2. wrapAppImage: default extraPkgs to pkgs: [ ] 

    Sane default in preparation for the next commit.
    @SuperSamus
    SuperSamus committed May 13, 2024
    Configuration menu
    Copy the full SHA
    1ee25e4 View commit details
    Browse the repository at this point in the history

  3. treewide: fix use of extraPkgs in AppImages 

    Mostly removes unnecessary use of `extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs;`
This caused some packages to be listed twice.

Also, fix some styling, and accidental use of top-level packages (sometimes due to the `with;` keyword, e.g. on `beeper`).
Remove inclusions of `bash`, since `bashInteractive` is already present by default.
    @SuperSamus
    SuperSamus committed May 13, 2024
    Configuration menu
    Copy the full SHA
    6e465f4 View commit details
    Browse the repository at this point in the history