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

molotov: init at 4.2.2 #92884

Merged
merged 1 commit into from Aug 15, 2020
Merged

molotov: init at 4.2.2 #92884

merged 1 commit into from Aug 15, 2020

Conversation

freezeboy
Copy link
Contributor

@freezeboy freezeboy commented Jul 10, 2020 •
edited

Motivation for this change

Package online tv application molotov which lets French users to access a range of TV channels

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.

symphorien
symphorien requested changes Jul 11, 2020
View reviewed changes
pkgs/applications/molotov/default.nix Outdated Show resolved Hide resolved
pkgs/applications/molotov/default.nix Outdated Show resolved Hide resolved
@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/223

@apeyroux apeyroux mentioned this pull request Aug 10, 2020
Closed
10 tasks
apeyroux
apeyroux reviewed Aug 10, 2020
View reviewed changes
Copy link
Member

@apeyroux apeyroux left a comment

Choose a reason for hiding this comment

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

Are the desktop icons set up right with this way?

https://github.com/NixOS/nixpkgs/pull/95116/files#diff-d1a400d53589e8ce54a2e73b92151e33R17-R25

  extraInstallCommands = ''
    mv $out/bin/${name} $out/bin/${pname}
    install -m 444 -D \
      ${appimageContents}/${pname}.desktop \
      $out/share/applications/${pname}.desktop
    substituteInPlace $out/share/applications/${pname}.desktop \
      --replace 'Exec=AppRun' 'Exec=${pname}'
    cp -r ${appimageContents}/usr/share/icons $out/share
  '';

pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved
@freezeboy
Copy link
Contributor Author

integrated your variations, last week end I tried to only extract the binary from the appimage, but was stuck with a SIGTRAP error (I think due to chrome-sandbox requiring suid, but I am not sure).

I added me and @apeyroux as maintainer also if you are ok ?

@apeyroux
Copy link
Member

integrated your variations, last week end I tried to only extract the binary from the appimage, but was stuck with a SIGTRAP error (I think due to chrome-sandbox requiring suid, but I am not sure).

You can try with https://github.com/apeyroux/molotov.nix

I didn't have any problem during the execution (authentication and watching TV)

I added me and @apeyroux as maintainer also if you are ok ?

Yes

@freezeboy
Copy link
Contributor Author

integrated your variations, last week end I tried to only extract the binary from the appimage, but was stuck with a SIGTRAP error (I think due to chrome-sandbox requiring suid, but I am not sure).

You can try with https://github.com/apeyroux/molotov.nix

Well using wrapType2 it is also ok on my side, it doesn't work if I try to extract just the app from the appimage + buildFHSEnv machinery

@freezeboy
Copy link
Contributor Author

@ofborg build molotov

@ofborg ofborg bot requested a review from apeyroux August 11, 2020 02:15
apeyroux
apeyroux suggested changes Aug 12, 2020
View reviewed changes
Copy link
Member

@apeyroux apeyroux left a comment

Choose a reason for hiding this comment

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

You should only do one commit. I don't think that history will pass.

@ofborg ofborg bot requested a review from apeyroux August 13, 2020 08:11
@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/202

jonringer
jonringer approved these changes Aug 15, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

diff LGTM
gui launches fine

https://github.com/NixOS/nixpkgs/pull/92884
1 package built:
molotov

@jonringer jonringer merged commit 3e988df into NixOS:master Aug 15, 2020
@freezeboy freezeboy deleted the add-molotov branch August 20, 2020 07:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@symphorien symphorien symphorien requested changes

@apeyroux apeyroux apeyroux approved these changes

@jonringer jonringer jonringer approved these changes

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

Successfully merging this pull request may close these issues.

None yet
5 participants
@freezeboy @nixos-discourse @apeyroux @jonringer @symphorien