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

enlightenment: add xkeyboard-config dependency #40690

Merged
merged 1 commit into from May 18, 2018
Merged

enlightenment: add xkeyboard-config dependency #40690

merged 1 commit into from May 18, 2018

Conversation

romildo
Copy link
Contributor

@romildo romildo commented May 17, 2018

Motivation for this change

  • Add runtime dependence on xkeyboard-config

  • Add base.lst from xkeyboard-config to the list of keyboard layout
    files. Something similar to this has been removed in a previous patch
    by mistake.

  • Fix location of binary edge_cc. This has been removed in a previous
    patch by mastake.

  • Make the explanation for the wrapping of some binaries more clear.

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.

@romildo
enlightenment: add xkeyboard-config dependency
05d413d 
- Add runtime dependence on xkeyboard-config

- Add base.lst from xkeyboard-config to the list of keyboard layout
files. Something similar to this has been removed in a previous patch
by mistake.

- Fix location of binary edge_cc. This has been removed in a previous
patch by mastake.

- Make the explanation for the wrapping of some binaries more clear.
@romildo
Copy link
Contributor Author

romildo commented May 17, 2018

@GrahamcOfBorg build enlightenment.enlightenment

@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: enlightenment.enlightenment

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: enlightenment.enlightenment

Partial log (click to expand)

shrinking /nix/store/iz3k4sl16iaq1rhwfhfjwl04faafvmza-enlightenment-0.22.3/lib/enlightenment/modules/syscon/linux-gnu-x86_64-0.22/module.so
shrinking /nix/store/iz3k4sl16iaq1rhwfhfjwl04faafvmza-enlightenment-0.22.3/lib/enlightenment/modules/conf/linux-gnu-x86_64-0.22/module.so
shrinking /nix/store/iz3k4sl16iaq1rhwfhfjwl04faafvmza-enlightenment-0.22.3/lib/enlightenment/modules/xkbswitch/linux-gnu-x86_64-0.22/module.so
shrinking /nix/store/iz3k4sl16iaq1rhwfhfjwl04faafvmza-enlightenment-0.22.3/lib/enlightenment/modules/vkbd/linux-gnu-x86_64-0.22/module.so
shrinking /nix/store/iz3k4sl16iaq1rhwfhfjwl04faafvmza-enlightenment-0.22.3/lib/enlightenment/modules/conf_performance/linux-gnu-x86_64-0.22/module.so
strip is /nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/iz3k4sl16iaq1rhwfhfjwl04faafvmza-enlightenment-0.22.3/lib  /nix/store/iz3k4sl16iaq1rhwfhfjwl04faafvmza-enlightenment-0.22.3/bin
patching script interpreter paths in /nix/store/iz3k4sl16iaq1rhwfhfjwl04faafvmza-enlightenment-0.22.3
/nix/store/iz3k4sl16iaq1rhwfhfjwl04faafvmza-enlightenment-0.22.3/bin/enlightenment_remote: interpreter directive changed from "/bin/sh" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/sh"
checking for references to /build in /nix/store/iz3k4sl16iaq1rhwfhfjwl04faafvmza-enlightenment-0.22.3...

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: enlightenment.enlightenment

Partial log (click to expand)

   Compiling build_helper v0.1.0 (file:///build/rustc-1.25.0-src/src/build_helper)
   Compiling std v0.0.0 (file:///build/rustc-1.25.0-src/src/libstd)
   Compiling compiler_builtins v0.0.0 (file:///build/rustc-1.25.0-src/src/rustc/compiler_builtins_shim)
   Compiling alloc_jemalloc v0.0.0 (file:///build/rustc-1.25.0-src/src/liballoc_jemalloc)
building of '/nix/store/4hr926a8lssn681j4wsp0ji4mnrznbgi-rustc-1.25.0.drv' timed out after 3600 seconds
cannot build derivation '/nix/store/31aq3sgwplx6z3r7p77nybarfv14rclq-cargo-0.26.0.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/nwz2yc22ndlxz5p6jnxkk2hkgf4jyggx-librsvg-2.42.2.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/9bbqp3ijw9yhvd0ai4awwkk1ssp8wjwn-efl-1.20.7.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/ags7wjfjv36n5ylbg0id0rrs358dmm45-enlightenment-0.22.3.drv': 1 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/ags7wjfjv36n5ylbg0id0rrs358dmm45-enlightenment-0.22.3.drv' failed

@xeji xeji merged commit e8b8ba1 into NixOS:master May 18, 2018
@romildo romildo deleted the fix.enlightenment branch May 18, 2018 17:08
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
3 participants
@romildo @GrahamcOfBorg @xeji