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

retroarch: 1.6.0 -> 1.7.1 #36237

Merged
merged 2 commits into from Mar 4, 2018
Merged

retroarch: 1.6.0 -> 1.7.1 #36237

merged 2 commits into from Mar 4, 2018

Conversation

ghost
Copy link

@ghost ghost commented Mar 3, 2018

Motivation for this change

Updated RetroArch and made a few changes:

  • Removed unneeded dependencies.
  • Added Vulkan option.
  • Fixed incorrect homepage.
  • Formatting.
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.

@Mic92
Copy link
Member

Mic92 commented Mar 3, 2018

@GrahamcOfBorg build retroarch

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Partial log (click to expand)

In file included from /nix/store/g94jv2hb0sadznj8dy39vxdvp6cj35z5-CF-osx-10.10.5/Library/Frameworks/CoreFoundation.framework/Headers/CFStream.h:38:
In file included from /nix/store/lvbg3qxa84bck05k425mj5n4hxx2n60n-Libsystem-osx-10.11.6/include/dispatch/dispatch.h:48:
/nix/store/lvbg3qxa84bck05k425mj5n4hxx2n60n-Libsystem-osx-10.11.6/include/os/object.h:75:9: fatal error: 'objc/NSObject.h' file not found
#import <objc/NSObject.h>
        ^~~~~~~~~~~~~~~~~
1 error generated.
make: *** [Makefile:181: obj-unix/release/frontend/drivers/platform_darwin.o] Error 1
builder for '/nix/store/g4g4b2zhqsjfyd455b8567q3315k7g5n-retroarch-bare-1.7.1.drv' failed with exit code 2
cannot build derivation '/nix/store/bhw7jblgwa4q5wpral1fqsq2f79bf4rq-retroarch-1.7.1.drv': 1 dependencies couldn't be built
error: build of '/nix/store/bhw7jblgwa4q5wpral1fqsq2f79bf4rq-retroarch-1.7.1.drv' failed

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/8wiawy0ixmv1bckfzxzaqihvprl9cfsi-retroarch-bare-1.7.1
shrinking /nix/store/8wiawy0ixmv1bckfzxzaqihvprl9cfsi-retroarch-bare-1.7.1/bin/.retroarch-wrapped
gzipping man pages under /nix/store/8wiawy0ixmv1bckfzxzaqihvprl9cfsi-retroarch-bare-1.7.1/share/man/
strip is /nix/store/lvx1acn1ig1j2km8jds5x3ggh3f2wa8v-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/8wiawy0ixmv1bckfzxzaqihvprl9cfsi-retroarch-bare-1.7.1/bin
patching script interpreter paths in /nix/store/8wiawy0ixmv1bckfzxzaqihvprl9cfsi-retroarch-bare-1.7.1
checking for references to /build in /nix/store/8wiawy0ixmv1bckfzxzaqihvprl9cfsi-retroarch-bare-1.7.1...
building '/nix/store/84l1wp993dpy731k3g296j96nxmzs7jx-retroarch-1.7.1.drv'...
/nix/store/4x537qc0ilwkk3swp8dnh50xgqlvh3zc-retroarch-1.7.1

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/r46w5d646gx7f1jwcjii3qfig7zspc49-retroarch-bare-1.7.1
shrinking /nix/store/r46w5d646gx7f1jwcjii3qfig7zspc49-retroarch-bare-1.7.1/bin/.retroarch-wrapped
gzipping man pages under /nix/store/r46w5d646gx7f1jwcjii3qfig7zspc49-retroarch-bare-1.7.1/share/man/
strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/r46w5d646gx7f1jwcjii3qfig7zspc49-retroarch-bare-1.7.1/bin 
patching script interpreter paths in /nix/store/r46w5d646gx7f1jwcjii3qfig7zspc49-retroarch-bare-1.7.1
checking for references to /tmp/nix-build-retroarch-bare-1.7.1.drv-0 in /nix/store/r46w5d646gx7f1jwcjii3qfig7zspc49-retroarch-bare-1.7.1...
building path(s) ‘/nix/store/p53fjfybfhbfx582gfb2317b24s4xv0r-retroarch-1.7.1’
/nix/store/p53fjfybfhbfx582gfb2317b24s4xv0r-retroarch-1.7.1

@Mic92
Copy link
Member

Mic92 commented Mar 3, 2018

@LnL7 where can we get #import <objc/NSObject.h> from usually?

Would we need ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc;?

@LnL7
Copy link
Member

LnL7 commented Mar 3, 2018

Yeah, pretty sure it's in there.

@Mic92
Copy link
Member

Mic92 commented Mar 3, 2018

@DarkScythe97 can give this line a try. It should be added to buildInputs.

@LnL7
Copy link
Member

LnL7 commented Mar 3, 2018

@GrahamcOfBorg build retroarch

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Partial log (click to expand)

CC libretro-common/audio/audio_mix.c
frontend/drivers/platform_darwin.m:35:10: fatal error: 'Foundation/NSPathUtilities.h' file not found
#include <Foundation/NSPathUtilities.h>
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
make: *** [Makefile:181: obj-unix/release/frontend/drivers/platform_darwin.o] Error 1
make: *** Waiting for unfinished jobs....
builder for '/nix/store/820d23v1alllbnhmsnhzbfmaasxb5vhw-retroarch-bare-1.7.1.drv' failed with exit code 2
cannot build derivation '/nix/store/sm80npbd2wwbn7anhvqkiac44f8hww6y-retroarch-1.7.1.drv': 1 dependencies couldn't be built
error: build of '/nix/store/sm80npbd2wwbn7anhvqkiac44f8hww6y-retroarch-1.7.1.drv' failed

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/zwhwpkincjgy6i2l40c2z51z6y5zws3b-retroarch-bare-1.7.1
shrinking /nix/store/zwhwpkincjgy6i2l40c2z51z6y5zws3b-retroarch-bare-1.7.1/bin/.retroarch-wrapped
gzipping man pages under /nix/store/zwhwpkincjgy6i2l40c2z51z6y5zws3b-retroarch-bare-1.7.1/share/man/
strip is /nix/store/lvx1acn1ig1j2km8jds5x3ggh3f2wa8v-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/zwhwpkincjgy6i2l40c2z51z6y5zws3b-retroarch-bare-1.7.1/bin
patching script interpreter paths in /nix/store/zwhwpkincjgy6i2l40c2z51z6y5zws3b-retroarch-bare-1.7.1
checking for references to /build in /nix/store/zwhwpkincjgy6i2l40c2z51z6y5zws3b-retroarch-bare-1.7.1...
building '/nix/store/jl7gj3mab13s9s5ihwbj3mqff2vvlwpr-retroarch-1.7.1.drv'...
/nix/store/hhq692hcgrc4qlymdh4l89z225z0zqkx-retroarch-1.7.1

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/8wvm6xpw4cqf23adkznq282qaj9cx7mr-retroarch-bare-1.7.1
shrinking /nix/store/8wvm6xpw4cqf23adkznq282qaj9cx7mr-retroarch-bare-1.7.1/bin/.retroarch-wrapped
gzipping man pages under /nix/store/8wvm6xpw4cqf23adkznq282qaj9cx7mr-retroarch-bare-1.7.1/share/man/
strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/8wvm6xpw4cqf23adkznq282qaj9cx7mr-retroarch-bare-1.7.1/bin 
patching script interpreter paths in /nix/store/8wvm6xpw4cqf23adkznq282qaj9cx7mr-retroarch-bare-1.7.1
checking for references to /tmp/nix-build-retroarch-bare-1.7.1.drv-0 in /nix/store/8wvm6xpw4cqf23adkznq282qaj9cx7mr-retroarch-bare-1.7.1...
building path(s) ‘/nix/store/4l9pamsgav1xwjmhdqygx89fh148sl1c-retroarch-1.7.1’
/nix/store/4l9pamsgav1xwjmhdqygx89fh148sl1c-retroarch-1.7.1

@LnL7
Copy link
Member

LnL7 commented Mar 3, 2018

This might get a bit cumbersome to fix like this, I'll take a quick look tomorrow.

@LnL7
Copy link
Member

LnL7 commented Mar 4, 2018

@GrahamcOfBorg build retroarch

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Partial log (click to expand)

these derivations will be built:
  /nix/store/qvig0nibzmgn0rcn21iaapnl7pfc4jhq-retroarch-1.7.1.drv
building '/nix/store/qvig0nibzmgn0rcn21iaapnl7pfc4jhq-retroarch-1.7.1.drv'...
/nix/store/phn201z1zwd0pzjhrv7yywaczc4zf8ry-retroarch-1.7.1

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/zwhwpkincjgy6i2l40c2z51z6y5zws3b-retroarch-bare-1.7.1
shrinking /nix/store/zwhwpkincjgy6i2l40c2z51z6y5zws3b-retroarch-bare-1.7.1/bin/.retroarch-wrapped
gzipping man pages under /nix/store/zwhwpkincjgy6i2l40c2z51z6y5zws3b-retroarch-bare-1.7.1/share/man/
strip is /nix/store/lvx1acn1ig1j2km8jds5x3ggh3f2wa8v-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/zwhwpkincjgy6i2l40c2z51z6y5zws3b-retroarch-bare-1.7.1/bin
patching script interpreter paths in /nix/store/zwhwpkincjgy6i2l40c2z51z6y5zws3b-retroarch-bare-1.7.1
checking for references to /build in /nix/store/zwhwpkincjgy6i2l40c2z51z6y5zws3b-retroarch-bare-1.7.1...
building '/nix/store/jl7gj3mab13s9s5ihwbj3mqff2vvlwpr-retroarch-1.7.1.drv'...
/nix/store/hhq692hcgrc4qlymdh4l89z225z0zqkx-retroarch-1.7.1

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/8wvm6xpw4cqf23adkznq282qaj9cx7mr-retroarch-bare-1.7.1
shrinking /nix/store/8wvm6xpw4cqf23adkznq282qaj9cx7mr-retroarch-bare-1.7.1/bin/.retroarch-wrapped
gzipping man pages under /nix/store/8wvm6xpw4cqf23adkznq282qaj9cx7mr-retroarch-bare-1.7.1/share/man/
strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/8wvm6xpw4cqf23adkznq282qaj9cx7mr-retroarch-bare-1.7.1/bin 
patching script interpreter paths in /nix/store/8wvm6xpw4cqf23adkznq282qaj9cx7mr-retroarch-bare-1.7.1
checking for references to /tmp/nix-build-retroarch-bare-1.7.1.drv-0 in /nix/store/8wvm6xpw4cqf23adkznq282qaj9cx7mr-retroarch-bare-1.7.1...
building path(s) ‘/nix/store/4l9pamsgav1xwjmhdqygx89fh148sl1c-retroarch-1.7.1’
/nix/store/4l9pamsgav1xwjmhdqygx89fh148sl1c-retroarch-1.7.1

@LnL7 LnL7 merged commit 95eb92a into NixOS:master Mar 4, 2018
@ghost ghost deleted the retroarch branch March 4, 2018 22:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants