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

mednafen: 0.9.47 -> 0.9.48, disable PIC, unversioned docs #29863

Merged
merged 2 commits into from Oct 5, 2017

Conversation

lukateras
Copy link
Member

Motivation for this change

Version bump. HTTP -> HTTPS in meta.homepage, simpler postInstall.
Mednafen doesn't want to be compiled with PIC, so now it's disabled:

../../include/mednafen/types.h:28:4: warning: #warning "Compiling with position-independent code generation enabled is not recommended, for performance reasons." [-Wcpp]
   #warning "Compiling with position-independent code generation enabled is not recommended, for performance reasons."
    ^~~~~~~

This also includes using $out/share directory that is similar to what other distros use, i.e. no version in the directory name.

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
    • Linux
  • 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.

@lukateras lukateras force-pushed the mednafen/0.9.48 branch 2 times, most recently from d051887 to 46d3daf Compare September 27, 2017 17:13
, SDL, SDL_net, zlib
}:
{ stdenv, fetchurl, pkgconfig, libX11, mesa, freeglut, libjack2,
, libcdio, libsndfile, libsamplerate, SDL, SDL_net, zlib }:
Copy link
Contributor

Choose a reason for hiding this comment

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

Syntax error here

Copy link
Member Author

Choose a reason for hiding this comment

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

Made a last-minute change, sorry about that. Fixed now.

Copy link
Member

@AndersonTorres AndersonTorres left a comment

Choose a reason for hiding this comment

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

It compiles OK here.

[ pkgconfig libX11 mesa freeglut libjack2 libcdio
libsndfile libsamplerate SDL SDL_net zlib ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libX11 mesa freeglut libjack2 libcdio libsndfile libsamplerate SDL SDL_net zlib ];
Copy link
Member

Choose a reason for hiding this comment

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

Line surpassing the 80-column rule. (Just a question of good style I like to enforce)

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed.

@orivej orivej merged commit da20916 into NixOS:master Oct 5, 2017
@lukateras lukateras deleted the mednafen/0.9.48 branch October 6, 2017 03:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants