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

SDL2_{gfx,mixer,net,ttf}: fix Darwin build #34089

Merged
merged 2 commits into from Jan 20, 2018
Merged

Conversation

mnacamura
Copy link
Contributor

Motivation for this change

Hopefully this fixes 89c8671.

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.

@jtojnar
Copy link
Contributor

jtojnar commented Jan 20, 2018

@GrahamcOfBorg build SDL2_gfx SDL2_mixer SDL2_net SDL2_ttf

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: x86_64-linux

  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed

  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
100 13696  100 13696    0     0  13696      0  0:00:01 --:--:--  0:00:01 76088


100 63272  100 63272    0     0  63272      0  0:00:01 --:--:--  0:00:01  566k

/nix/store/pfinsmw3pd0cpd9h7g0g994n9jbrxbr8-SDL2_gfx-1.0.1
/nix/store/gc7xjyi5z5fi7a80if5myzv1gqb4jr32-SDL2_mixer-2.0.2
/nix/store/81yjh9hhcksj32rv0hljan55sczcag6w-SDL2_net-2.0.1
/nix/store/qxl0smqzvchn870gk5s122ak08waqa2c-SDL2_ttf-2.0.14

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: aarch64-linux

copying path '/nix/store/am2jlyi40299w38k5iy0dlw7b1plvx5d-SDL2-2.0.7-dev' from 'https://cache.nixos.org'...
copying path '/nix/store/qkq67g4xmq56b2gnhb6sy943s08zf1b6-SDL2_gfx-1.0.1' from 'https://cache.nixos.org'...
copying path '/nix/store/wwa18pwxr962j47687q6m4x1s9rpv4py-SDL2_ttf-2.0.14' from 'https://cache.nixos.org'...
copying path '/nix/store/6cwsn2j4jqpk6als73rx7g6a75ynkcbm-SDL2_net-2.0.1' from 'https://cache.nixos.org'...
copying path '/nix/store/1x2jb5zfhwdic20x7g1xmnq5b2k6y7hq-smpeg2-svn412' from 'https://cache.nixos.org'...
copying path '/nix/store/xbpps45zmhr9xcs9q11s8wrnw62x0wb4-SDL2_mixer-2.0.2' from 'https://cache.nixos.org'...
/nix/store/qkq67g4xmq56b2gnhb6sy943s08zf1b6-SDL2_gfx-1.0.1
/nix/store/xbpps45zmhr9xcs9q11s8wrnw62x0wb4-SDL2_mixer-2.0.2
/nix/store/6cwsn2j4jqpk6als73rx7g6a75ynkcbm-SDL2_net-2.0.1
/nix/store/wwa18pwxr962j47687q6m4x1s9rpv4py-SDL2_ttf-2.0.14

@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "16jrijzdp095qf416zvj9gs2fqqn6zkyvlxs5xqybd0ip37cp6yn";
};

nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
Copy link
Contributor

Choose a reason for hiding this comment

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

Are you sure this should be in nativeBuildInputs?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

My bad. Probably libobjc should be in buildInputs.

@LnL7 LnL7 merged commit 1fa5c8a into NixOS:master Jan 20, 2018
Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: x86_64-darwin

/nix/store/977jc5nd9cd22rdly4d990zb4hhdb6fs-SDL2_mixer-2.0.2/lib/libSDL2_mixer-2.0.0.dylib: fixing dylib
/nix/store/977jc5nd9cd22rdly4d990zb4hhdb6fs-SDL2_mixer-2.0.2/lib/libSDL2_mixer-2.0.0.dylib: fixing dylib
/nix/store/977jc5nd9cd22rdly4d990zb4hhdb6fs-SDL2_mixer-2.0.2/lib/libSDL2_mixer-2.0.0.dylib: fixing dylib
/nix/store/977jc5nd9cd22rdly4d990zb4hhdb6fs-SDL2_mixer-2.0.2/lib/libSDL2_mixer-2.0.0.dylib: fixing dylib
/nix/store/977jc5nd9cd22rdly4d990zb4hhdb6fs-SDL2_mixer-2.0.2/lib/libSDL2_mixer-2.0.0.dylib: fixing dylib
/nix/store/977jc5nd9cd22rdly4d990zb4hhdb6fs-SDL2_mixer-2.0.2/lib/libSDL2_mixer-2.0.0.dylib: fixing dylib
/nix/store/2vkncg59bcwi3mamam4lf5qxflvh2igj-SDL2_gfx-1.0.1
/nix/store/977jc5nd9cd22rdly4d990zb4hhdb6fs-SDL2_mixer-2.0.2
/nix/store/yj751s98kg7bb2m68n0cjryps4ch1whs-SDL2_net-2.0.1
/nix/store/a8vfflnhlmi08w0p2ch5nl1hpfjfxbdq-SDL2_ttf-2.0.14

@mnacamura mnacamura deleted the sdl2-darwin-fix branch January 21, 2018 06:56
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