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

shotcut: 18.06.02 -> 18.05.08 #42300

Merged
merged 2 commits into from Jun 20, 2018
Merged

shotcut: 18.06.02 -> 18.05.08 #42300

merged 2 commits into from Jun 20, 2018

Conversation

woffs
Copy link
Contributor

@woffs woffs commented Jun 20, 2018

also patched to build with qt511, see
mltframework/shotcut#590

Thanks @Mic92 for poking.

Could not check functionality yet because of qt510 vs. qt511 runtime environment.

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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.

@woffs
shotcut: 18.06.02 -> 18.05.08
e0d0460 
also patched to build with qt511, see
mltframework/shotcut#590
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: shotcut

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/18r8cd7bj53ya6livggqv1pq6sa3xgdb-shotcut-18.06.02
shrinking /nix/store/18r8cd7bj53ya6livggqv1pq6sa3xgdb-shotcut-18.06.02/bin/.shotcut-wrapped
strip is /nix/store/4mf2xm9p32lzrim927yk92xhx35yaz62-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/18r8cd7bj53ya6livggqv1pq6sa3xgdb-shotcut-18.06.02/bin
patching script interpreter paths in /nix/store/18r8cd7bj53ya6livggqv1pq6sa3xgdb-shotcut-18.06.02
checking for references to /build in /nix/store/18r8cd7bj53ya6livggqv1pq6sa3xgdb-shotcut-18.06.02...
postPatchMkspecs
postPatchMkspecs
/nix/store/18r8cd7bj53ya6livggqv1pq6sa3xgdb-shotcut-18.06.02

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: shotcut

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/pf1asi255gk3g2i8yp947nyji2ma6bd1-shotcut-18.06.02
shrinking /nix/store/pf1asi255gk3g2i8yp947nyji2ma6bd1-shotcut-18.06.02/bin/.shotcut-wrapped
strip is /nix/store/min150lkigznaayzpwvf8d4jdl1dqvx6-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/pf1asi255gk3g2i8yp947nyji2ma6bd1-shotcut-18.06.02/bin
patching script interpreter paths in /nix/store/pf1asi255gk3g2i8yp947nyji2ma6bd1-shotcut-18.06.02
checking for references to /build in /nix/store/pf1asi255gk3g2i8yp947nyji2ma6bd1-shotcut-18.06.02...
postPatchMkspecs
postPatchMkspecs
/nix/store/pf1asi255gk3g2i8yp947nyji2ma6bd1-shotcut-18.06.02

Mic92
Mic92 reviewed Jun 20, 2018
View reviewed changes
pkgs/applications/video/shotcut/default.nix Outdated
@@ -34,6 +35,13 @@ stdenv.mkDerivation rec {
sed "s_/usr/bin/nice_''${NICE}_" -i src/jobs/meltjob.cpp src/jobs/ffmpegjob.cpp
'';

patchFlags = "-p0";
patches = [ (fetchpatch {
url = https://github.com/mltframework/shotcut/files/2075592/shotcut-18.06.02-qt.patch.txt;
Copy link
Member

Choose a reason for hiding this comment

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

This url is stable (does not change its content)? Is 2075592 a tag or something similar?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Don't know. Changed it.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: shotcut

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/s5xklvf886smaqdp8vzixfhvi4njr7bm-shotcut-18.06.02
shrinking /nix/store/s5xklvf886smaqdp8vzixfhvi4njr7bm-shotcut-18.06.02/bin/.shotcut-wrapped
strip is /nix/store/4mf2xm9p32lzrim927yk92xhx35yaz62-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/s5xklvf886smaqdp8vzixfhvi4njr7bm-shotcut-18.06.02/bin
patching script interpreter paths in /nix/store/s5xklvf886smaqdp8vzixfhvi4njr7bm-shotcut-18.06.02
checking for references to /build in /nix/store/s5xklvf886smaqdp8vzixfhvi4njr7bm-shotcut-18.06.02...
postPatchMkspecs
postPatchMkspecs
/nix/store/s5xklvf886smaqdp8vzixfhvi4njr7bm-shotcut-18.06.02

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: shotcut

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/v5q1ry8kdn8ynsar9jlphqp3jib2agnr-shotcut-18.06.02
shrinking /nix/store/v5q1ry8kdn8ynsar9jlphqp3jib2agnr-shotcut-18.06.02/bin/.shotcut-wrapped
strip is /nix/store/min150lkigznaayzpwvf8d4jdl1dqvx6-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/v5q1ry8kdn8ynsar9jlphqp3jib2agnr-shotcut-18.06.02/bin
patching script interpreter paths in /nix/store/v5q1ry8kdn8ynsar9jlphqp3jib2agnr-shotcut-18.06.02
checking for references to /build in /nix/store/v5q1ry8kdn8ynsar9jlphqp3jib2agnr-shotcut-18.06.02...
postPatchMkspecs
postPatchMkspecs
/nix/store/v5q1ry8kdn8ynsar9jlphqp3jib2agnr-shotcut-18.06.02

@Mic92 Mic92 merged commit 80fa12f into NixOS:master Jun 20, 2018
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

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@woffs @GrahamcOfBorg @Mic92