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

xpra.xf86videodummy: init at 0.3.8 #43562

Merged
merged 1 commit into from Oct 1, 2018
Merged

xpra.xf86videodummy: init at 0.3.8 #43562

merged 1 commit into from Oct 1, 2018

Conversation

numinit
Copy link
Contributor

@numinit numinit commented Jul 15, 2018

Motivation for this change

If you want correct DPI scaling in xpra, you need a patched xf86videodummy driver (see: https://xpra.org/trac/wiki/Xdummy for the patches).

Create one as xpra.xf86videodummy.

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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@numinit numinit mentioned this pull request Jul 15, 2018
Closed
@numinit numinit force-pushed the xf86videodummy branch 3 times, most recently from a3edbd4 to b45bcaa Compare July 15, 2018 09:28
ryantm
ryantm requested changes Aug 31, 2018
View reviewed changes
Copy link
Member

@ryantm ryantm left a comment

Choose a reason for hiding this comment

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

needs merge conflict resolution before further review

@numinit
Copy link
Contributor Author

numinit commented Sep 9, 2018

Conflict fixed.

ryantm
ryantm requested changes Sep 9, 2018
View reviewed changes
pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved
pkgs/tools/X11/xpra/default.nix Outdated Show resolved Hide resolved
pkgs/tools/X11/xpra/default.nix Outdated Show resolved Hide resolved
@ryantm

This comment has been minimized.

Sign in to view
@GrahamcOfBorg

This comment has been minimized.

Sign in to view
@GrahamcOfBorg

This comment has been minimized.

Sign in to view
@GrahamcOfBorg

This comment has been minimized.

Sign in to view
@ryantm
Copy link
Member

ryantm commented Oct 1, 2018

@GrahamcOfBorg build xpra.xf86videodummy

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: xpra.xf86videodummy

Partial log (click to expand)

No package 'xorg-server' found

Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.

Alternatively, you may set the environment variables XORG_CFLAGS
and XORG_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
builder for '/nix/store/rk15nkw8s69b1qrwkjqq9pp2v79hr7dc-xpra-xf86videodummy-0.3.8-1.drv' failed with exit code 1
error: build of '/nix/store/rk15nkw8s69b1qrwkjqq9pp2v79hr7dc-xpra-xf86videodummy-0.3.8-1.drv' failed

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: xpra.xf86videodummy

Partial log (click to expand)

make[1]: Leaving directory '/build/xf86-video-dummy-0.3.8'
propagating requisites
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/8mypsxbg0qvic7w53na35vq6zsw8acrb-xpra-xf86videodummy-0.3.8-1
shrinking /nix/store/8mypsxbg0qvic7w53na35vq6zsw8acrb-xpra-xf86videodummy-0.3.8-1/lib/xorg/modules/drivers/dummy_drv.so
strip is /nix/store/y4ymnvgxygpq05h03kyzbj572zmh6zla-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/8mypsxbg0qvic7w53na35vq6zsw8acrb-xpra-xf86videodummy-0.3.8-1/lib
patching script interpreter paths in /nix/store/8mypsxbg0qvic7w53na35vq6zsw8acrb-xpra-xf86videodummy-0.3.8-1
checking for references to /build in /nix/store/8mypsxbg0qvic7w53na35vq6zsw8acrb-xpra-xf86videodummy-0.3.8-1...
/nix/store/8mypsxbg0qvic7w53na35vq6zsw8acrb-xpra-xf86videodummy-0.3.8-1

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: xpra.xf86videodummy

Partial log (click to expand)

make[1]: Leaving directory '/build/xf86-video-dummy-0.3.8'
propagating requisites
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/iys8bjmlk0mq3bx5715jynb19pmsjzac-xpra-xf86videodummy-0.3.8-1
shrinking /nix/store/iys8bjmlk0mq3bx5715jynb19pmsjzac-xpra-xf86videodummy-0.3.8-1/lib/xorg/modules/drivers/dummy_drv.so
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/iys8bjmlk0mq3bx5715jynb19pmsjzac-xpra-xf86videodummy-0.3.8-1/lib
patching script interpreter paths in /nix/store/iys8bjmlk0mq3bx5715jynb19pmsjzac-xpra-xf86videodummy-0.3.8-1
checking for references to /build in /nix/store/iys8bjmlk0mq3bx5715jynb19pmsjzac-xpra-xf86videodummy-0.3.8-1...
/nix/store/iys8bjmlk0mq3bx5715jynb19pmsjzac-xpra-xf86videodummy-0.3.8-1

@ryantm ryantm merged commit f01a201 into NixOS:master Oct 1, 2018
@ryantm
Copy link
Member

ryantm commented Oct 1, 2018

Thanks!

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

@ryantm ryantm ryantm approved these changes

Assignees
No one assigned
Labels
8.has: package (new) 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
4 participants
@numinit @ryantm @GrahamcOfBorg @xeji