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

Jump to bottom

mediathekview: 9 -> 13.2.1 #38964

Merged
merged 2 commits into from Jan 19, 2019
Merged

mediathekview: 9 -> 13.2.1 #38964

merged 2 commits into from Jan 19, 2019

Conversation

Moredread
Copy link
Contributor

@Moredread Moredread commented Apr 15, 2018 •
edited

Motivation for this change

First, zdfmediathk seems to be a duplicate of mediathekview, as the upstream project is https://mediathekview.de now. (Not yet removed in this PR).

I got the recent version almost working, but the dependency OpenJFX isn't available in nix yet. See issue #16727 for that.

I used the zdfmediathk expression as the base for the update as it seemed more complete, but the package name mediathekview matches how upstream calls the package.

@chaoflow @flosse: Are you still interested in maintaining MediathekView? Have you tried updating the package recently?

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@Moredread Moredread mentioned this pull request Apr 15, 2018
Closed
@Mic92
Copy link
Member

Mic92 commented Apr 22, 2018

I get now:

$ mediathek
Picked up _JAVA_OPTIONS: -Dawt.useSystemAAFontSettings=lcd -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel
===========================================
JavaFX wurde nicht im klassenpfad gefunden.
 Stellen Sie sicher, dass Sie ein Java JRE ab Version 8 benutzen.
 Falls Sie Linux nutzen, installieren Sie das openjfx-Paket ihres Package-Managers,
 oder nutzen Sie eine eigene JRE-Installation.
===========================================

@Mic92
Copy link
Member

Mic92 commented Apr 22, 2018

Ah also mentioned in the description.

@Moredread
Copy link
Contributor Author

Moredread commented Apr 23, 2018 •
edited

Btw, the old version isn't working anymore. If you want to use Mediatheview in the meantime you can use it with the Oracle JRE, as it has JavaFX bundled.

That might be a solution for the package as well until openjfx is working.

@Moredread
Copy link
Contributor Author

I've updated the PR so it now uses the OracleJRE. As the package isn't usable at the moment otherwise, I think this is the best way to go forward until OpenJFX is supported.

@Moredread Moredread changed the title WIP mediathekview: 9 -> 13.0.6 mediathekview: 9 -> 13.2.1 Jan 14, 2019
@Moredread
Copy link
Contributor Author

@Mic92 Could you have a look again please?

@Mic92
Copy link
Member

Mic92 commented Jan 16, 2019

There is still an evaluation error for darwin, which I try to fix in:
https://github.com/NixOS/nixpkgs/pull/54044/files

@Moredread
Copy link
Contributor Author

Moredread commented Jan 18, 2019 •
edited

@Mic92 I've cleaned up a few things (derivation inputs, removed java flags) and removed the obsolete zdfmediathk package as well.

Edit: And moved the flv.sh helper script to the share folder.

dotlambda
dotlambda requested changes Jan 18, 2019
View reviewed changes
pkgs/applications/video/mediathekview/default.nix Outdated Show resolved Hide resolved
pkgs/applications/video/mediathekview/default.nix
homepage = https://mediathekview.de/;
license = licenses.gpl3;
maintainers = with maintainers; [ chaoflow moredread ];
platforms = platforms.all;
Copy link
Member

Choose a reason for hiding this comment

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

Did you test this?

Copy link
Member

@Mic92 Mic92 Jan 18, 2019 •
edited

Choose a reason for hiding this comment

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

The limiting factor here would be probably our bash wrapper that does not run as it is on windows. But I think it should work apart from that.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I took it from one of the old zdfmediathk package. Should I change it or leave it as is?

@Mic92
Copy link
Member

Mic92 commented Jan 18, 2019

@GrahamcOfBorg build mediathekview

@Moredread
mediathekview: 9 -> 13.2.1
88098b1 
Use OracleJRE for now, as OpenJFX isn't packaged yet for OpenJDK.
@Moredread
zdfmediathk: Remove as it is obsolete and broken
c18c25f 
The package `mediathekview` is the current alternative.
@Mic92 Mic92 merged commit db804db into NixOS:master Jan 19, 2019
@Moredread Moredread deleted the wip/mediathekview branch January 19, 2019 15:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

@dotlambda dotlambda dotlambda requested changes

Assignees
No one assigned
Labels
2.status: work-in-progress 8.has: clean-up 8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@Moredread @Mic92 @dotlambda @matthewbauer @GrahamcOfBorg