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

xkeyboard-config: enable xkb rules symlink #40625

Merged
merged 1 commit into from Jul 28, 2018
Merged

xkeyboard-config: enable xkb rules symlink #40625

merged 1 commit into from Jul 28, 2018

Conversation

romildo
Copy link
Contributor

@romildo romildo commented May 17, 2018

Motivation for this change

The xorg.lst file is needed by the Enlightenment desktop environment in order to set keyboard layouts. xkeyboard-config should be configured with the flag --with-xkb-rules-symlink=xorg in order to provide it.

Fedora, Arch and Gentoo linux all use this configuration currently.

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
Copy link
Contributor Author

romildo commented May 17, 2018

@GrahamcOfBorg build xkeyboard_config

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: xkeyboard_config

Partial log (click to expand)

make[2]: Nothing to be done for 'install-exec-am'.
 /nix/store/5lkrw9dnsgy62qm1ampvww1c5n1pdm4b-coreutils-8.29/bin/mkdir -p '/nix/store/lv7rmcghnb310n4sry3mkv5sksp96df5-xkeyboard-config-2.22/share/pkgconfig'
 /nix/store/5lkrw9dnsgy62qm1ampvww1c5n1pdm4b-coreutils-8.29/bin/install -c -m 644 xkeyboard-config.pc '/nix/store/lv7rmcghnb310n4sry3mkv5sksp96df5-xkeyboard-config-2.22/share/pkgconfig'
make[2]: Leaving directory '/private/tmp/nix-build-xkeyboard-config-2.22.drv-0/xkeyboard-config-2.22'
make[1]: Leaving directory '/private/tmp/nix-build-xkeyboard-config-2.22.drv-0/xkeyboard-config-2.22'
propagating requisites
post-installation fixup
strip is /nix/store/kdff2gim6417493yha769kh00n63lnrw-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/lv7rmcghnb310n4sry3mkv5sksp96df5-xkeyboard-config-2.22/lib
patching script interpreter paths in /nix/store/lv7rmcghnb310n4sry3mkv5sksp96df5-xkeyboard-config-2.22

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: xkeyboard_config

Partial log (click to expand)

make[2]: Leaving directory '/build/xkeyboard-config-2.22'
make[1]: Leaving directory '/build/xkeyboard-config-2.22'
propagating requisites
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/zxp54kj7n0y1hp5rkhd1ck7his5yvyv5-xkeyboard-config-2.22
strip is /nix/store/jk6j4lh9v5mvjdbdc35sj0zffhhf6s56-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/zxp54kj7n0y1hp5rkhd1ck7his5yvyv5-xkeyboard-config-2.22/lib
patching script interpreter paths in /nix/store/zxp54kj7n0y1hp5rkhd1ck7his5yvyv5-xkeyboard-config-2.22
checking for references to /build in /nix/store/zxp54kj7n0y1hp5rkhd1ck7his5yvyv5-xkeyboard-config-2.22...
/nix/store/zxp54kj7n0y1hp5rkhd1ck7his5yvyv5-xkeyboard-config-2.22

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: xkeyboard_config

Partial log (click to expand)

 /nix/store/jy9knxp7nmw80jkf932axrs1b4p9k4hi-coreutils-8.29/bin/install -c -m 644 xkeyboard-config.pc '/nix/store/203hgar6qvii3fhxk8bh8bwsqnhlxyp2-xkeyboard-config-2.22/share/pkgconfig'
make[2]: Leaving directory '/build/xkeyboard-config-2.22'
make[1]: Leaving directory '/build/xkeyboard-config-2.22'
propagating requisites
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/203hgar6qvii3fhxk8bh8bwsqnhlxyp2-xkeyboard-config-2.22
strip is /nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/203hgar6qvii3fhxk8bh8bwsqnhlxyp2-xkeyboard-config-2.22/lib
patching script interpreter paths in /nix/store/203hgar6qvii3fhxk8bh8bwsqnhlxyp2-xkeyboard-config-2.22
checking for references to /build in /nix/store/203hgar6qvii3fhxk8bh8bwsqnhlxyp2-xkeyboard-config-2.22...

@infinisil infinisil merged commit 5edb09c into NixOS:master Jul 28, 2018
@romildo romildo deleted the fix.xkeyboard-config branch July 28, 2018 03:06
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: 101-500 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@romildo @GrahamcOfBorg @infinisil