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: fix the xkb search path #45752

Merged
merged 1 commit into from Aug 30, 2018
Merged

xpra: fix the xkb search path #45752

merged 1 commit into from Aug 30, 2018

Conversation

atanasi
Copy link
Contributor

@atanasi atanasi commented Aug 29, 2018 •
edited

Search for the xkb files in the nix store.

Motivation for this change

xpra failed to find the xkb files.

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.

@atanasi
xpra: fix the xkb search path
729a06b 
Search for the xkb files in the nix store.
@Mic92
Copy link
Member

Mic92 commented Aug 29, 2018

@GrahamcOfBorg build xpra

@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: xpra

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.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: xpra

Partial log (click to expand)

/nix/store/4s0am1b58kaqbdqyfh9xhxjg2g68h8xz-xpra-2.3.3/lib/xpra/gvfs-open: interpreter directive changed from "/bin/sh" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/sh"
/nix/store/4s0am1b58kaqbdqyfh9xhxjg2g68h8xz-xpra-2.3.3/bin/xpra_udev_product_version: interpreter directive changed from "/bin/bash" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/bash"
/nix/store/4s0am1b58kaqbdqyfh9xhxjg2g68h8xz-xpra-2.3.3/bin/xpra_Xdummy: interpreter directive changed from "/bin/sh" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/4s0am1b58kaqbdqyfh9xhxjg2g68h8xz-xpra-2.3.3...
wrapping `/nix/store/4s0am1b58kaqbdqyfh9xhxjg2g68h8xz-xpra-2.3.3/bin/.xpra-wrapped'...
wrapping `/nix/store/4s0am1b58kaqbdqyfh9xhxjg2g68h8xz-xpra-2.3.3/bin/xpra_launcher'...
wrapping `/nix/store/4s0am1b58kaqbdqyfh9xhxjg2g68h8xz-xpra-2.3.3/bin/xpra_browser'...
wrapping `/nix/store/4s0am1b58kaqbdqyfh9xhxjg2g68h8xz-xpra-2.3.3/bin/xpra_signal_listener'...
running install tests
/nix/store/4s0am1b58kaqbdqyfh9xhxjg2g68h8xz-xpra-2.3.3

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: xpra

Partial log (click to expand)

/nix/store/ld5n2d73729r4j72w3j4nilkp2n38500-xpra-2.3.3/lib/xpra/gnome-open: interpreter directive changed from "/bin/sh" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/sh"
/nix/store/ld5n2d73729r4j72w3j4nilkp2n38500-xpra-2.3.3/lib/xpra/gvfs-open: interpreter directive changed from "/bin/sh" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/sh"
/nix/store/ld5n2d73729r4j72w3j4nilkp2n38500-xpra-2.3.3/lib/xpra/xdg-open: interpreter directive changed from "/usr/bin/env python" to "/nix/store/imv54r70hay2sjrbjiw9l5hhmq3zdkkx-python-2.7.15/bin/python"
checking for references to /build in /nix/store/ld5n2d73729r4j72w3j4nilkp2n38500-xpra-2.3.3...
wrapping `/nix/store/ld5n2d73729r4j72w3j4nilkp2n38500-xpra-2.3.3/bin/.xpra-wrapped'...
wrapping `/nix/store/ld5n2d73729r4j72w3j4nilkp2n38500-xpra-2.3.3/bin/xpra_browser'...
wrapping `/nix/store/ld5n2d73729r4j72w3j4nilkp2n38500-xpra-2.3.3/bin/xpra_launcher'...
wrapping `/nix/store/ld5n2d73729r4j72w3j4nilkp2n38500-xpra-2.3.3/bin/xpra_signal_listener'...
running install tests
/nix/store/ld5n2d73729r4j72w3j4nilkp2n38500-xpra-2.3.3

@xeji xeji merged commit 5914bf4 into NixOS:master Aug 30, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
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
4 participants
@atanasi @Mic92 @GrahamcOfBorg @xeji