drawpile: 2.1.20 -> 2.2.1, cleanup #306734
Conversation
ofborg
bot
added
11.by: package-maintainer
|
Hi! I've looked into why the Turs out that this happened because there is also a top-level |
|
Good point. Fixed. |
|
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; | |||
There was a problem hiding this comment.
I am not sure if null is valid here
| } // ( | ||
| if buildClient then | ||
| { mainProgram = "drawpile"; } | ||
| else if buildServer then | ||
| { mainProgram = "drawpile-srv"; } | ||
| else {} | ||
| ); |
There was a problem hiding this comment.
| } // ( | |
| if buildClient then | |
| { mainProgram = "drawpile"; } | |
| else if buildServer then | |
| { mainProgram = "drawpile-srv"; } | |
| else {} | |
| ); | |
| } // lib.optionalAttrs buildClient { | |
| mainProgram = "drawpile"; | |
| } // lib.optionalAttrs buildServer { | |
| mainProgram = "drawpile-srv"; | |
| }; |
There was a problem hiding this comment.
Nice! I flipped the unions to make it equivalent to my code (so drawpile has priority over drawpile-srv).
fgaz
force-pushed
the
drawpile/2.2.1
branch
2 times, most recently
from
e90464c to
e73b62f
Compare
Description of changes
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.