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.

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

xteddy: init at 2.2 #57057

Merged
merged 1 commit into from Mar 8, 2019
Merged

xteddy: init at 2.2 #57057

merged 1 commit into from Mar 8, 2019

Conversation

xaverdh
Copy link
Contributor

@xaverdh xaverdh commented Mar 8, 2019

Motivation for this change

This adds the version of xteddy as packaged by debian.

Im not sure which meta.homepage to set. There are several sane choices:

Also I had to drop two trivial scripts from the upstream tarball, that reference paths in /usr and such.
They are not essential for the program, so I decided to just remove them.

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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@markuskowa
Copy link
Member

markuskowa commented Mar 8, 2019 •
edited

@GrahamcOfBorg eval
@GrahamcOfBorg build xteddy

@xaverdh
Copy link
Contributor Author

xaverdh commented Mar 8, 2019

I added another commit on top, with small fixes, should I squash that?

markuskowa
markuskowa reviewed Mar 8, 2019
View reviewed changes
Copy link
Member

@markuskowa markuskowa left a comment

Choose a reason for hiding this comment

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

Please insert some empty lines after src each post*. That makes the code more readable.

pkgs/applications/misc/xteddy/default.nix Outdated
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ imlib2 xorg.libX11 xorg.libXext ];
makeFlags = [ "LIBS=-lXext" ];
preBuild = ''
Copy link
Member

Choose a reason for hiding this comment

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

I would change it to postPatch since we are actually patching the sources here

pkgs/applications/misc/xteddy/default.nix Show resolved Hide resolved
@markuskowa
Copy link
Member

Yes, please squash all commits.

@xaverdh
Copy link
Contributor Author

xaverdh commented Mar 8, 2019

Ok, I added some whitespace and applied your suggestions.
xtoys does indeed work now :-)

@xeji
Copy link
Contributor

xeji commented Mar 8, 2019

@GrahamcOfBorg build xteddy

@xeji xeji merged commit ebcfdf5 into NixOS:master Mar 8, 2019
@xaverdh xaverdh deleted the xteddy-2.2 branch March 8, 2019 23:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@markuskowa markuskowa markuskowa left review comments

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@xaverdh @markuskowa @xeji @GrahamcOfBorg