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

spice-gtk: fix symlink errors, add withPolkit option #37184

Merged
merged 1 commit into from Mar 28, 2018

Conversation

xeji
Copy link
Contributor

@xeji xeji commented Mar 16, 2018

Motivation for this change

Fix bugs due to broken symlinks that were introduced by #35214.
Make polkit support, which was added in #35214 and requires a setuid helper, optional but enabled by default. Add documentation.
Fixes #36533, #37110.

Please backport to 18.03. /cc ZHF #36453

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.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: spice-gtk

Partial log (click to expand)

shrinking /nix/store/hliq31kvhkgigbc9i62ld6wizmskhxww-spice-gtk-0.34/bin/spicy-stats
shrinking /nix/store/hliq31kvhkgigbc9i62ld6wizmskhxww-spice-gtk-0.34/bin/spicy-screenshot
shrinking /nix/store/hliq31kvhkgigbc9i62ld6wizmskhxww-spice-gtk-0.34/lib/libspice-controller.so.0.0.0
shrinking /nix/store/hliq31kvhkgigbc9i62ld6wizmskhxww-spice-gtk-0.34/lib/libspice-client-gtk-3.0.so.5.0.0
shrinking /nix/store/hliq31kvhkgigbc9i62ld6wizmskhxww-spice-gtk-0.34/lib/libspice-client-glib-2.0.so.8.6.0
gzipping man pages under /nix/store/hliq31kvhkgigbc9i62ld6wizmskhxww-spice-gtk-0.34/share/man/
strip is /nix/store/fzcs0fn6bb04m82frhlb78nc03ny3w55-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/hliq31kvhkgigbc9i62ld6wizmskhxww-spice-gtk-0.34/lib  /nix/store/hliq31kvhkgigbc9i62ld6wizmskhxww-spice-gtk-0.34/bin 
patching script interpreter paths in /nix/store/hliq31kvhkgigbc9i62ld6wizmskhxww-spice-gtk-0.34
checking for references to /tmp/nix-build-spice-gtk-0.34.drv-0 in /nix/store/hliq31kvhkgigbc9i62ld6wizmskhxww-spice-gtk-0.34...

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: spice-gtk

Partial log (click to expand)

shrinking /nix/store/w9y0y6gmcyx7svi76l2y6lz2f62wqaac-spice-gtk-0.34/bin/spice-client-glib-usb-acl-helper
shrinking /nix/store/w9y0y6gmcyx7svi76l2y6lz2f62wqaac-spice-gtk-0.34/lib/libspice-client-gtk-3.0.so.5.0.0
shrinking /nix/store/w9y0y6gmcyx7svi76l2y6lz2f62wqaac-spice-gtk-0.34/lib/libspice-client-glib-2.0.so.8.6.0
shrinking /nix/store/w9y0y6gmcyx7svi76l2y6lz2f62wqaac-spice-gtk-0.34/lib/libspice-controller.so.0.0.0
gzipping man pages under /nix/store/w9y0y6gmcyx7svi76l2y6lz2f62wqaac-spice-gtk-0.34/share/man/
strip is /nix/store/3zq400fri5dv7d30lpxlqm2v9y1iis6j-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/w9y0y6gmcyx7svi76l2y6lz2f62wqaac-spice-gtk-0.34/lib  /nix/store/w9y0y6gmcyx7svi76l2y6lz2f62wqaac-spice-gtk-0.34/bin
patching script interpreter paths in /nix/store/w9y0y6gmcyx7svi76l2y6lz2f62wqaac-spice-gtk-0.34
checking for references to /build in /nix/store/w9y0y6gmcyx7svi76l2y6lz2f62wqaac-spice-gtk-0.34...
/nix/store/w9y0y6gmcyx7svi76l2y6lz2f62wqaac-spice-gtk-0.34

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: spice-gtk

Partial log (click to expand)


make[3]: *** [Makefile:448: install-policyDATA] Error 1
make[3]: Leaving directory '/tmp/nix-build-spice-gtk-0.34.drv-0/spice-gtk-0.34/data'
make[2]: *** [Makefile:541: install-am] Error 2
make[2]: Leaving directory '/tmp/nix-build-spice-gtk-0.34.drv-0/spice-gtk-0.34/data'
make[1]: *** [Makefile:627: install-recursive] Error 1
make[1]: Leaving directory '/tmp/nix-build-spice-gtk-0.34.drv-0/spice-gtk-0.34'
make: *** [Makefile:929: install] Error 2
builder for ‘/nix/store/kz1j4v45aq0i4czd4bljjj2p19z8fdbz-spice-gtk-0.34.drv’ failed with exit code 2
error: build of ‘/nix/store/kz1j4v45aq0i4czd4bljjj2p19z8fdbz-spice-gtk-0.34.drv’ failed

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: spice-gtk

Partial log (click to expand)

strip is /nix/store/3zq400fri5dv7d30lpxlqm2v9y1iis6j-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/sq2684avgnmi9yjdavaxbq8kc91ss3za-spice-gtk-0.34/lib  /nix/store/sq2684avgnmi9yjdavaxbq8kc91ss3za-spice-gtk-0.34/bin
patching script interpreter paths in /nix/store/sq2684avgnmi9yjdavaxbq8kc91ss3za-spice-gtk-0.34
checking for references to /build in /nix/store/sq2684avgnmi9yjdavaxbq8kc91ss3za-spice-gtk-0.34...
shrinking RPATHs of ELF executables and libraries in /nix/store/nv3jwvh691ldwc0zmqx93pq295jgd7mi-spice-gtk-0.34-dev
strip is /nix/store/3zq400fri5dv7d30lpxlqm2v9y1iis6j-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/nv3jwvh691ldwc0zmqx93pq295jgd7mi-spice-gtk-0.34-dev/lib
patching script interpreter paths in /nix/store/nv3jwvh691ldwc0zmqx93pq295jgd7mi-spice-gtk-0.34-dev
checking for references to /build in /nix/store/nv3jwvh691ldwc0zmqx93pq295jgd7mi-spice-gtk-0.34-dev...
/nix/store/sq2684avgnmi9yjdavaxbq8kc91ss3za-spice-gtk-0.34

@xeji
Copy link
Contributor Author

xeji commented Mar 23, 2018

Had to rebase after recent gnome changes on master. Don't understand why ofborg build failed on x86_64 after that. The build succeeds on my machine. From the derivation hash, it looks like ofborg is on a different (probably older) revision of master. Let's try again.

@xeji
Copy link
Contributor Author

xeji commented Mar 23, 2018

@GrahamcOfBorg build spice-gtk.x86_64-linux

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: spice-gtk.x86_64-linux

Partial log (click to expand)

Cannot nix-instantiate `spice-gtk.x86_64-linux' because:
�[31;1merror:�[0m attribute 'x86_64-linux' in selection path 'spice-gtk.x86_64-linux' not found

@GrahamcOfBorg
Copy link

No attempt on x86_64-linux (full log)

The following builds were skipped because they don't evaluate on x86_64-linux: spice-gtk.x86_64-linux

Partial log (click to expand)

Cannot nix-instantiate `spice-gtk.x86_64-linux' because:
error: attribute 'x86_64-linux' in selection path 'spice-gtk.x86_64-linux' not found

@xeji
Copy link
Contributor Author

xeji commented Mar 23, 2018

@GrahamcOfBorg build spice-gtk

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: spice-gtk

Partial log (click to expand)

/nix/store/sq2684avgnmi9yjdavaxbq8kc91ss3za-spice-gtk-0.34

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: spice-gtk

Partial log (click to expand)

strip is /nix/store/fzcs0fn6bb04m82frhlb78nc03ny3w55-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/n08548vi5qs8kvidd05aw2rc1fwcbkhp-spice-gtk-0.34/lib  /nix/store/n08548vi5qs8kvidd05aw2rc1fwcbkhp-spice-gtk-0.34/bin
patching script interpreter paths in /nix/store/n08548vi5qs8kvidd05aw2rc1fwcbkhp-spice-gtk-0.34
checking for references to /build in /nix/store/n08548vi5qs8kvidd05aw2rc1fwcbkhp-spice-gtk-0.34...
shrinking RPATHs of ELF executables and libraries in /nix/store/lkx1yflm6g4lpqvdck07ppba0xag64a2-spice-gtk-0.34-dev
strip is /nix/store/fzcs0fn6bb04m82frhlb78nc03ny3w55-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/lkx1yflm6g4lpqvdck07ppba0xag64a2-spice-gtk-0.34-dev/lib
patching script interpreter paths in /nix/store/lkx1yflm6g4lpqvdck07ppba0xag64a2-spice-gtk-0.34-dev
checking for references to /build in /nix/store/lkx1yflm6g4lpqvdck07ppba0xag64a2-spice-gtk-0.34-dev...
/nix/store/n08548vi5qs8kvidd05aw2rc1fwcbkhp-spice-gtk-0.34

@fpletz fpletz added this to the 18.03 milestone Mar 28, 2018
@fpletz fpletz merged commit ecbf439 into NixOS:master Mar 28, 2018
@xeji xeji deleted the spice-gtk-fix branch March 28, 2018 18:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants