cosmic-player: init at unstable-2025-01-14#373897
cosmic-player: init at unstable-2025-01-14#373897RossComputerGuy merged 1 commit intoNixOS:masterfrom
Conversation
a-kenji
left a comment
There was a problem hiding this comment.
Thank you for packaging this package.
This package is not upstreamable in its current form.
Please look at the cosmic-edit package that you maintain: https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/co/cosmic-edit/package.nix#L32.
It uses the useFetchCargoVendor = true; functionality, which makes the Cargo.lock file obsolete.
I haven't looked at the source you got it from, but those packages don't seem upstreamable.
|
Thanks for the review @a-kenji ! I was mainly worried about the gst plugins (legal can be a funny thing) and was worried that I included something that I not have haha. |
dcc09c4 to
50572af
Compare
|
@a-kenji I think that's what you wanted correct? |
|
|
Yes, that is what I wanted. It builds fine. But I can't get it to run. |
|
Yea I noticed that as well and I'll work on it later today. I still want to get Lily's blessing to use her work and make her I credit her before merging this though. |
The force-linking libwayland-client that upstream nixos-cosmic does for all libcosmic-based apps is load-bearing and would be needed here too for it to run (it appears to have been excluded when copy-pasting)
I unfortunately will not be blessing this work, but I also won't stop you from following license terms if you copy-paste substantial portions, and I don't otherwise mind the work! (most relevantly source attribution is required for substantially copy-pasted portions -- a courtesy link in code comment to nixos-cosmic so people know where to update the derivation from when it needs updating would be helpful too, but is not strictly required) |
|
@lilyinstarlight I'd be happy to include that link (once I have it as I'm not sure where that would be) in a code comment and anything else to give the credit to you. |
35c134f to
70678f2
Compare
|
@a-kenji I suspect that should work now. |
|
Yes, it does work for me now. |
RossComputerGuy
left a comment
There was a problem hiding this comment.
Little nitpicks, also should squash the commits to 1.
There was a problem hiding this comment.
So like this?:
meta = {
maintainers = with lib.maintainers; [ ahoneybun ];
license = licenses.gpl3Only;
};
There was a problem hiding this comment.
Otherwise it errors out:
aaronh@pop-os:~/Projects/NixOS/nixpkgs$ nix-build -A cosmic-player --max-jobs 1
error:
… while evaluating a branch condition
at /home/aaronh/Projects/NixOS/nixpkgs/lib/customisation.nix:303:5:
302| in
303| if missingArgs == { } then
| ^
304| makeOverridable f allArgs
… while calling the 'removeAttrs' builtin
at /home/aaronh/Projects/NixOS/nixpkgs/lib/attrsets.nix:647:5:
646| set:
647| removeAttrs set (filter (name: ! pred name set.${name}) (attrNames set));
| ^
648|
(stack trace truncated; use '--show-trace' to show the full, detailed trace)
error: syntax error, unexpected '['
at /home/aaronh/Projects/NixOS/nixpkgs/pkgs/by-name/co/cosmic-player/package.nix:106:36:
105| license = lib.licenses.gpl3Only;
106| maintainers = lib.maintainers; [ ahoneybun ];
| ^
107| platforms = platforms.linux;
There was a problem hiding this comment.
maintainers = with lib.maintainers; [ ahoneybun ];
Closely scoped is acceptable I believe.
There was a problem hiding this comment.
Should be good to go in that I believe.
5254a09 to
765478f
Compare
Things done
This is based on @lilyinstarlight work in the nixos-cosmic repo linked below.
https://github.com/lilyinstarlight/nixos-cosmic/blob/main/pkgs/cosmic-player/package.nix
This is based on the latest tag for COSMIC Player which is epoch-1.0.0-alpha.5.1
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.