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

cinnamon.muffin: init at 4.4.2 #78117

Merged
merged 1 commit into from Mar 20, 2020
Merged

cinnamon.muffin: init at 4.4.2 #78117

merged 1 commit into from Mar 20, 2020

Conversation

mkg20001
Copy link
Member

@mkg20001 mkg20001 commented Jan 20, 2020 •
edited

Motivation for this change

Needed for cinnamon port

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@mkg20001 mkg20001 force-pushed the pkg/muffin branch 6 times, most recently from cd82fe7 to a858459 Compare January 24, 2020 22:11
@mkg20001 mkg20001 force-pushed the pkg/muffin branch 3 times, most recently from a4b3cde to e0e1a02 Compare January 25, 2020 02:36
@worldofpeace
Copy link
Contributor

Apparently there's some configure options we should be setting https://github.com/linuxmint/muffin/blob/bd0d7723bfb42ba33abf00e09d7564b386f468a0/debian/rules#L34, as recommended by upstream. linuxmint/muffin#548 (comment)

@worldofpeace worldofpeace changed the title cinnamon.muffin: init at 4.4.1 cinnamon.muffin: init at 4.4.2 Jan 29, 2020
@mkg20001
Copy link
Member Author

@worldofpeace I added the patch which enables those options by default, removed the other egl patch as it's no longer needed

jtojnar
jtojnar reviewed Mar 16, 2020
View reviewed changes
pkgs/desktops/cinnamon/muffin/default.nix Outdated Show resolved Hide resolved
pkgs/desktops/cinnamon/muffin/default.nix Outdated Show resolved Hide resolved
pkgs/desktops/cinnamon/muffin/default.nix Outdated Show resolved Hide resolved
@mkg20001 mkg20001 force-pushed the pkg/muffin branch 4 times, most recently from eb084e0 to 0704f57 Compare March 17, 2020 12:22
@mkg20001
Copy link
Member Author

have to re-add autoreconf hook since it breaks the build: https://logs.nix.ci/?key=nixos/nixpkgs.78117&attempt_id=c676be4a-2afd-4b9d-8e00-b68645c54342

@mkg20001 mkg20001 force-pushed the pkg/muffin branch 2 times, most recently from cdaa16f to 065c972 Compare March 18, 2020 03:41
@mkg20001
Copy link
Member Author

looks like it's just my "fix" that broke stuff, removed that and works now

@mkg20001
Copy link
Member Author

applied changes. should be good to merge?

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/120

@jtojnar jtojnar merged commit a08d4f6 into NixOS:master Mar 20, 2020
@jtojnar
Copy link
Contributor

jtojnar commented Mar 20, 2020

Thanks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar jtojnar left review comments

@worldofpeace worldofpeace Awaiting requested review from worldofpeace

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@mkg20001 @worldofpeace @nixos-discourse @jtojnar