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

xorg.libXTrap: init at 1.0.1 (Fix build of xorg.xtrap) #65806

Merged
merged 2 commits into from
Aug 4, 2019
Merged

xorg.libXTrap: init at 1.0.1 (Fix build of xorg.xtrap) #65806

merged 2 commits into from
Aug 4, 2019

Conversation

JohnAZoidberg
Copy link
Member

Motivation for this change

xorg.xtrap wouldn't build because the library was missing.

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 nix-review --run "nix-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@JohnAZoidberg
pkgs/servers/x11/xorg: Git-ignore download-cache
c2466ce 
It's generated when updating using generate-expr-from-tarballs.pl
@JohnAZoidberg
xorg.libXTrap: init at 1.0.1
e3329f9 
Fixes build of xorg.xtrap
@worldofpeace
Copy link
Contributor

This is a generated file, so we shouldn't edit it manually.
So I'm wondering why this script doesn't generate it.

@JohnAZoidberg
Copy link
Member Author

I only edited tarballs.list. Is that generated, too?

@worldofpeace
Copy link
Contributor

Ah, I didn't see you touching the tarballs.list and thought it was a manual addition only to pkgs/servers/x11/xorg/default.nix .

This should be good then 👍

worldofpeace
worldofpeace approved these changes Aug 4, 2019
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

I can build xorg.xtrap. Per directory .gitignore should be fine too.

@worldofpeace worldofpeace merged commit 972ae11 into NixOS:master Aug 4, 2019
@JohnAZoidberg JohnAZoidberg deleted the fix-xtrap branch August 4, 2019 09:55
@ahiaao ahiaao mentioned this pull request Sep 10, 2019
Closed
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@worldofpeace worldofpeace worldofpeace approved these changes

Assignees
No one assigned
Labels
8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@JohnAZoidberg @worldofpeace