Skip to content

vlc: 3.0.1 -> 3.0.3#41483

Merged
xeji merged 1 commit intoNixOS:masterfrom
bkchr:vlc_3_0_3
Jun 5, 2018
Merged

vlc: 3.0.1 -> 3.0.3#41483
xeji merged 1 commit intoNixOS:masterfrom
bkchr:vlc_3_0_3

Conversation

@bkchr
Copy link
Contributor

@bkchr bkchr commented Jun 5, 2018

Besides updating the version, a patch is applied for building with
QT5.11.

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.

Besides updating the version, a patch is applied for building with
QT5.11.
@bkchr bkchr mentioned this pull request Jun 5, 2018
8 tasks
@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Jun 5, 2018
@xeji
Copy link
Contributor

xeji commented Jun 5, 2018

Did you check that the patch doesn't break the build when withQt5 = false; ?
(Don't know if anyone does that but since the option exists, it should work.)

@bkchr
Copy link
Contributor Author

bkchr commented Jun 5, 2018

I did not test it with this option enabled, but this patch just modifies one cpp file that is exclusivly used with qt.

@xeji
Copy link
Contributor

xeji commented Jun 5, 2018

@GrahamcOfBorg build vlc vlc_qt5

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: vlc, vlc_qt5

Partial log (click to expand)

copying path '/nix/store/5ync7h99g0w2s7c9xgfvm3lpmmw8fnq4-qtsvg-5.10.1' from 'https://cache.nixos.org'...
copying path '/nix/store/0imyhyw0p2zzn3p066dd1031fcqshwlc-qtbase-5.10.1-dev' from 'https://cache.nixos.org'...
copying path '/nix/store/z7l8xmnkgpfih7aw26cpdipncmvq8hb6-qtsvg-5.10.1-bin' from 'https://cache.nixos.org'...
copying path '/nix/store/mb4s3liamva75dyl19g2lgzvipk584cy-qtx11extras-5.10.1' from 'https://cache.nixos.org'...
100   106    0   106    0     0     28      0 --:--:--  0:00:03 --:--:--    28
100 23.7M  100 23.7M    0     0  5659k      0  0:00:04  0:00:04 --:--:--  115M
copying path '/nix/store/11dwqz8j96mixpqp58ljz26m8r8m4biy-qtsvg-5.10.1-dev' from 'https://cache.nixos.org'...
copying path '/nix/store/3rhwy2gmrr4lk390jqb0msld3w9ff9w6-qtx11extras-5.10.1-dev' from 'https://cache.nixos.org'...
cannot build derivation '/nix/store/w1mzasiw7x6whhvxw2aysgzk2y3jyjxs-vlc-3.0.3.drv': 1 dependencies couldn't be built
error: build of '/nix/store/w1mzasiw7x6whhvxw2aysgzk2y3jyjxs-vlc-3.0.3.drv' failed

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: vlc, vlc_qt5

Partial log (click to expand)

/nix/store/781aa8ffamr8njnz0lcfwspddx8wrv33-vlc-3.0.3/share/vlc/utils/audio-vlc-default.sh: interpreter directive changed from "/bin/sh" to "/nix/store/qckzjk3406va7h6s40cy9s75z2w715rq-bash-4.4-p19/bin/sh"
/nix/store/781aa8ffamr8njnz0lcfwspddx8wrv33-vlc-3.0.3/share/vlc/utils/video-vlc-default.sh: interpreter directive changed from "/bin/sh" to "/nix/store/qckzjk3406va7h6s40cy9s75z2w715rq-bash-4.4-p19/bin/sh"
/nix/store/781aa8ffamr8njnz0lcfwspddx8wrv33-vlc-3.0.3/bin/cvlc: interpreter directive changed from " /bin/sh" to "/nix/store/qckzjk3406va7h6s40cy9s75z2w715rq-bash-4.4-p19/bin/sh"
/nix/store/781aa8ffamr8njnz0lcfwspddx8wrv33-vlc-3.0.3/bin/rvlc: interpreter directive changed from " /bin/sh" to "/nix/store/qckzjk3406va7h6s40cy9s75z2w715rq-bash-4.4-p19/bin/sh"
/nix/store/781aa8ffamr8njnz0lcfwspddx8wrv33-vlc-3.0.3/bin/qvlc: interpreter directive changed from " /bin/sh" to "/nix/store/qckzjk3406va7h6s40cy9s75z2w715rq-bash-4.4-p19/bin/sh"
/nix/store/781aa8ffamr8njnz0lcfwspddx8wrv33-vlc-3.0.3/bin/nvlc: interpreter directive changed from " /bin/sh" to "/nix/store/qckzjk3406va7h6s40cy9s75z2w715rq-bash-4.4-p19/bin/sh"
checking for references to /build in /nix/store/781aa8ffamr8njnz0lcfwspddx8wrv33-vlc-3.0.3...
postPatchMkspecs
/nix/store/781aa8ffamr8njnz0lcfwspddx8wrv33-vlc-3.0.3
/nix/store/781aa8ffamr8njnz0lcfwspddx8wrv33-vlc-3.0.3

@xeji xeji merged commit d3a07d7 into NixOS:master Jun 5, 2018
@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: vlc, vlc_qt5

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.


Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants