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.

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

drawpile: 2.1.20 -> 2.2.1, cleanup #306734

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Conversation

fgaz
Copy link
Member

@fgaz fgaz commented Apr 25, 2024

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@stuebinm
Copy link
Contributor

stuebinm commented Apr 25, 2024

Hi! I've looked into why the meta.mainProgram was set for drawpile in #297084 even though it has more than one binary.

Turs out that this happened because there is also a top-level drawpile-server-headless, which does only have the one executable, and is defined by the same source file, so for that package the change was correct … perhaps it would be best to have the value of mainProgram depend on whether or not the buildClient and buildServer flags are set?

@fgaz
Copy link
Member Author

fgaz commented Apr 25, 2024

Good point. Fixed.

@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-ready-for-review/3032/3935

@@ -105,7 +105,7 @@ in mkDerivation rec {

meta = {
description = "A collaborative drawing program that allows multiple users to sketch on the same canvas simultaneously";
mainProgram = "drawpile-srv";
mainProgram = if buildClient then "drawpile" else if buildServer then "drawpile-srv" else null;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure if null is valid here

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants