{"action":"created","comment":{"url":"https://api.github.com/repos/NixOS/nixpkgs/pulls/comments/175236094","pull_request_review_id":104743333,"id":175236094,"diff_hunk":"@@ -1,41 +1,54 @@\n-{ stdenv, fetchFromGitHub, gcc5, scons, pkgconfig, libX11, libXcursor\n-, libXinerama, libXrandr, libXrender, freetype, openssl, alsaLib\n-, libpulseaudio, libGLU, zlib }:\n-\n-stdenv.mkDerivation rec {\n+{ stdenv, lib, fetchFromGitHub, gcc5, scons, pkgconfig, libX11, libXcursor\n+, libXinerama, libXrandr, libXrender, libpulseaudio ? null\n+, libXi ? null, libXext, libXfixes, freetype, openssl\n+, alsaLib, libGLU, zlib, yasm ? null }:\n+\n+let\n+  options = {\n+    touch = libXi != null;\n+    pulseaudio = false;\n+  };\n+in stdenv.mkDerivation rec {\n   name    = \"godot-${version}\";\n-  version = \"2.1.4\";\n+  version = \"3.0.2\";\n \n   src = fetchFromGitHub {\n     owner  = \"godotengine\";\n     repo   = \"godot\";\n     rev    = \"${version}-stable\";\n-    sha256 = \"0d2zczn5k7296sky5gllq55cxd586nx134y2iwjpkqqjr62g0h48\";\n+    sha256 = \"1ca1zznb7qqn4vf2nfwb8nww5x0k8fc4lwjvgydr6nr2mn70xka4\";\n   };\n \n   nativeBuildInputs = [ pkgconfig ];\n   buildInputs = [\n     gcc5 scons libX11 libXcursor libXinerama libXrandr libXrender\n-    freetype openssl alsaLib libpulseaudio libGLU zlib\n+    libXi libXext libXfixes freetype openssl alsaLib libpulseaudio\n+    libGLU zlib yasm\n   ];\n \n-  patches = [ ./pkg_config_additions.patch ];\n+  patches = [\n+    ./pkg_config_additions.patch\n+    ./dont_clobber_environment.patch\n+  ];\n \n   enableParallelBuilding = true;\n \n   buildPhase = ''\n-    scons platform=x11 prefix=$out -j $NIX_BUILD_CORES\n+    scons platform=x11 prefix=$out -j $NIX_BUILD_CORES \\\n+      ${lib.concatStringsSep \" \"\n+          (lib.mapAttrsToList (k: v: \"${k}=${builtins.toJSON v}\") options)}\n   '';\n \n   installPhase = ''\n-    mkdir $out/bin -p\n-    cp bin/godot.* $out/bin/\n+    mkdir -p $out/bin\n+    cp -r bin/godot.x11.tools.64 $out/bin/godot\n   '';\n \n   meta = {\n     homepage    = \"https://godotengine.org\";\n     description = \"Free and Open Source 2D and 3D game engine\";\n     license     = stdenv.lib.licenses.mit;\n-    platforms   = stdenv.lib.platforms.linux;\n+    platforms   = [ \"i646-linux\" \"x86_64-linux\" ];","path":"pkgs/development/tools/godot/default.nix","position":64,"original_position":64,"commit_id":"5fbbd5e02bf73e3edb589e99b4f95658cf7109cd","original_commit_id":"5fbbd5e02bf73e3edb589e99b4f95658cf7109cd","user":{"login":"Ekleog","id":411447,"avatar_url":"https://avatars1.githubusercontent.com/u/411447?v=4","gravatar_id":"","url":"https://api.github.com/users/Ekleog","html_url":"https://github.com/Ekleog","followers_url":"https://api.github.com/users/Ekleog/followers","following_url":"https://api.github.com/users/Ekleog/following{/other_user}","gists_url":"https://api.github.com/users/Ekleog/gists{/gist_id}","starred_url":"https://api.github.com/users/Ekleog/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Ekleog/subscriptions","organizations_url":"https://api.github.com/users/Ekleog/orgs","repos_url":"https://api.github.com/users/Ekleog/repos","events_url":"https://api.github.com/users/Ekleog/events{/privacy}","received_events_url":"https://api.github.com/users/Ekleog/received_events","type":"User","site_admin":false},"body":"Hmm, didn't you mean `i686-linux` here? That's my reading of https://github.com/NixOS/nixpkgs/blob/master/lib/systems/platforms.nix#L558 at least.","created_at":"2018-03-16T23:30:06Z","updated_at":"2018-03-16T23:33:49Z","html_url":"https://github.com/NixOS/nixpkgs/pull/34971#discussion_r175236094","pull_request_url":"https://api.github.com/repos/NixOS/nixpkgs/pulls/34971","author_association":"CONTRIBUTOR","_links":{"self":{"href":"https://api.github.com/repos/NixOS/nixpkgs/pulls/comments/175236094"},"html":{"href":"https://github.com/NixOS/nixpkgs/pull/34971#discussion_r175236094"},"pull_request":{"href":"https://api.github.com/repos/NixOS/nixpkgs/pulls/34971"}}},"pull_request":{"url":"https://api.github.com/repos/NixOS/nixpkgs/pulls/34971","id":169177495,"html_url":"https://github.com/NixOS/nixpkgs/pull/34971","diff_url":"https://github.com/NixOS/nixpkgs/pull/34971.diff","patch_url":"https://github.com/NixOS/nixpkgs/pull/34971.patch","issue_url":"https://api.github.com/repos/NixOS/nixpkgs/issues/34971","number":34971,"state":"open","locked":false,"title":"Update and introduce Godot and godot_headers","user":{"login":"Twey","id":101639,"avatar_url":"https://avatars2.githubusercontent.com/u/101639?v=4","gravatar_id":"","url":"https://api.github.com/users/Twey","html_url":"https://github.com/Twey","followers_url":"https://api.github.com/users/Twey/followers","following_url":"https://api.github.com/users/Twey/following{/other_user}","gists_url":"https://api.github.com/users/Twey/gists{/gist_id}","starred_url":"https://api.github.com/users/Twey/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Twey/subscriptions","organizations_url":"https://api.github.com/users/Twey/orgs","repos_url":"https://api.github.com/users/Twey/repos","events_url":"https://api.github.com/users/Twey/events{/privacy}","received_events_url":"https://api.github.com/users/Twey/received_events","type":"User","site_admin":false},"body":"###### Motivation for this change\r\n\r\n\r\n###### Things done\r\n\r\n<!-- Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers. -->\r\n\r\n- [ ] Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `build-use-sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS)\r\n- Built on platform(s)\r\n   - [x] NixOS\r\n   - [ ] macOS\r\n   - [x] other Linux distributions\r\n- [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))\r\n- [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nox --run \"nox-review wip\"`\r\n- [x] Tested execution of all binary files (usually in `./result/bin/`)\r\n- [x] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).\r\n\r\n---\r\n\r\n","created_at":"2018-02-14T17:45:29Z","updated_at":"2018-03-16T23:33:49Z","closed_at":null,"merged_at":null,"merge_commit_sha":"f4323d79c0a7f846e23179ab4da049ba60c389ae","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[{"id":737642262,"url":"https://api.github.com/repos/NixOS/nixpkgs/labels/10.rebuild-darwin:%200","name":"10.rebuild-darwin: 0","color":"eeffee","default":false},{"id":731733923,"url":"https://api.github.com/repos/NixOS/nixpkgs/labels/10.rebuild-linux:%201-10","name":"10.rebuild-linux: 1-10","color":"eeffee","default":false},{"id":290122988,"url":"https://api.github.com/repos/NixOS/nixpkgs/labels/8.has:%20clean-up","name":"8.has: clean-up","color":"009800","default":false},{"id":290122734,"url":"https://api.github.com/repos/NixOS/nixpkgs/labels/8.has:%20package%20(new)","name":"8.has: package (new)","color":"009800","default":false}],"milestone":null,"commits_url":"https://api.github.com/repos/NixOS/nixpkgs/pulls/34971/commits","review_comments_url":"https://api.github.com/repos/NixOS/nixpkgs/pulls/34971/comments","review_comment_url":"https://api.github.com/repos/NixOS/nixpkgs/pulls/comments{/number}","comments_url":"https://api.github.com/repos/NixOS/nixpkgs/issues/34971/comments","statuses_url":"https://api.github.com/repos/NixOS/nixpkgs/statuses/5fbbd5e02bf73e3edb589e99b4f95658cf7109cd","head":{"label":"Twey:master","ref":"master","sha":"5fbbd5e02bf73e3edb589e99b4f95658cf7109cd","user":{"login":"Twey","id":101639,"avatar_url":"https://avatars2.githubusercontent.com/u/101639?v=4","gravatar_id":"","url":"https://api.github.com/users/Twey","html_url":"https://github.com/Twey","followers_url":"https://api.github.com/users/Twey/followers","following_url":"https://api.github.com/users/Twey/following{/other_user}","gists_url":"https://api.github.com/users/Twey/gists{/gist_id}","starred_url":"https://api.github.com/users/Twey/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Twey/subscriptions","organizations_url":"https://api.github.com/users/Twey/orgs","repos_url":"https://api.github.com/users/Twey/repos","events_url":"https://api.github.com/users/Twey/events{/privacy}","received_events_url":"https://api.github.com/users/Twey/received_events","type":"User","site_admin":false},"repo":{"id":22116505,"name":"nixpkgs","full_name":"Twey/nixpkgs","owner":{"login":"Twey","id":101639,"avatar_url":"https://avatars2.githubusercontent.com/u/101639?v=4","gravatar_id":"","url":"https://api.github.com/users/Twey","html_url":"https://github.com/Twey","followers_url":"https://api.github.com/users/Twey/followers","following_url":"https://api.github.com/users/Twey/following{/other_user}","gists_url":"https://api.github.com/users/Twey/gists{/gist_id}","starred_url":"https://api.github.com/users/Twey/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Twey/subscriptions","organizations_url":"https://api.github.com/users/Twey/orgs","repos_url":"https://api.github.com/users/Twey/repos","events_url":"https://api.github.com/users/Twey/events{/privacy}","received_events_url":"https://api.github.com/users/Twey/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/Twey/nixpkgs","description":"Nix Packages collection","fork":true,"url":"https://api.github.com/repos/Twey/nixpkgs","forks_url":"https://api.github.com/repos/Twey/nixpkgs/forks","keys_url":"https://api.github.com/repos/Twey/nixpkgs/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Twey/nixpkgs/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Twey/nixpkgs/teams","hooks_url":"https://api.github.com/repos/Twey/nixpkgs/hooks","issue_events_url":"https://api.github.com/repos/Twey/nixpkgs/issues/events{/number}","events_url":"https://api.github.com/repos/Twey/nixpkgs/events","assignees_url":"https://api.github.com/repos/Twey/nixpkgs/assignees{/user}","branches_url":"https://api.github.com/repos/Twey/nixpkgs/branches{/branch}","tags_url":"https://api.github.com/repos/Twey/nixpkgs/tags","blobs_url":"https://api.github.com/repos/Twey/nixpkgs/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Twey/nixpkgs/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Twey/nixpkgs/git/refs{/sha}","trees_url":"https://api.github.com/repos/Twey/nixpkgs/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Twey/nixpkgs/statuses/{sha}","languages_url":"https://api.github.com/repos/Twey/nixpkgs/languages","stargazers_url":"https://api.github.com/repos/Twey/nixpkgs/stargazers","contributors_url":"https://api.github.com/repos/Twey/nixpkgs/contributors","subscribers_url":"https://api.github.com/repos/Twey/nixpkgs/subscribers","subscription_url":"https://api.github.com/repos/Twey/nixpkgs/subscription","commits_url":"https://api.github.com/repos/Twey/nixpkgs/commits{/sha}","git_commits_url":"https://api.github.com/repos/Twey/nixpkgs/git/commits{/sha}","comments_url":"https://api.github.com/repos/Twey/nixpkgs/comments{/number}","issue_comment_url":"https://api.github.com/repos/Twey/nixpkgs/issues/comments{/number}","contents_url":"https://api.github.com/repos/Twey/nixpkgs/contents/{+path}","compare_url":"https://api.github.com/repos/Twey/nixpkgs/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Twey/nixpkgs/merges","archive_url":"https://api.github.com/repos/Twey/nixpkgs/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Twey/nixpkgs/downloads","issues_url":"https://api.github.com/repos/Twey/nixpkgs/issues{/number}","pulls_url":"https://api.github.com/repos/Twey/nixpkgs/pulls{/number}","milestones_url":"https://api.github.com/repos/Twey/nixpkgs/milestones{/number}","notifications_url":"https://api.github.com/repos/Twey/nixpkgs/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Twey/nixpkgs/labels{/name}","releases_url":"https://api.github.com/repos/Twey/nixpkgs/releases{/id}","deployments_url":"https://api.github.com/repos/Twey/nixpkgs/deployments","created_at":"2014-07-22T18:50:10Z","updated_at":"2018-03-16T19:55:05Z","pushed_at":"2018-03-16T19:54:57Z","git_url":"git://github.com/Twey/nixpkgs.git","ssh_url":"git@github.com:Twey/nixpkgs.git","clone_url":"https://github.com/Twey/nixpkgs.git","svn_url":"https://github.com/Twey/nixpkgs","homepage":null,"size":682933,"stargazers_count":0,"watchers_count":0,"language":"Nix","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"open_issues_count":0,"license":{"key":"other","name":"Other","spdx_id":null,"url":null},"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"NixOS:master","ref":"master","sha":"1317428ca026ec1d438e68cb0308b38028777492","user":{"login":"NixOS","id":487568,"avatar_url":"https://avatars3.githubusercontent.com/u/487568?v=4","gravatar_id":"","url":"https://api.github.com/users/NixOS","html_url":"https://github.com/NixOS","followers_url":"https://api.github.com/users/NixOS/followers","following_url":"https://api.github.com/users/NixOS/following{/other_user}","gists_url":"https://api.github.com/users/NixOS/gists{/gist_id}","starred_url":"https://api.github.com/users/NixOS/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/NixOS/subscriptions","organizations_url":"https://api.github.com/users/NixOS/orgs","repos_url":"https://api.github.com/users/NixOS/repos","events_url":"https://api.github.com/users/NixOS/events{/privacy}","received_events_url":"https://api.github.com/users/NixOS/received_events","type":"Organization","site_admin":false},"repo":{"id":4542716,"name":"nixpkgs","full_name":"NixOS/nixpkgs","owner":{"login":"NixOS","id":487568,"avatar_url":"https://avatars3.githubusercontent.com/u/487568?v=4","gravatar_id":"","url":"https://api.github.com/users/NixOS","html_url":"https://github.com/NixOS","followers_url":"https://api.github.com/users/NixOS/followers","following_url":"https://api.github.com/users/NixOS/following{/other_user}","gists_url":"https://api.github.com/users/NixOS/gists{/gist_id}","starred_url":"https://api.github.com/users/NixOS/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/NixOS/subscriptions","organizations_url":"https://api.github.com/users/NixOS/orgs","repos_url":"https://api.github.com/users/NixOS/repos","events_url":"https://api.github.com/users/NixOS/events{/privacy}","received_events_url":"https://api.github.com/users/NixOS/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/NixOS/nixpkgs","description":"Nix Packages collection","fork":false,"url":"https://api.github.com/repos/NixOS/nixpkgs","forks_url":"https://api.github.com/repos/NixOS/nixpkgs/forks","keys_url":"https://api.github.com/repos/NixOS/nixpkgs/keys{/key_id}","collaborators_url":"https://api.github.com/repos/NixOS/nixpkgs/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/NixOS/nixpkgs/teams","hooks_url":"https://api.github.com/repos/NixOS/nixpkgs/hooks","issue_events_url":"https://api.github.com/repos/NixOS/nixpkgs/issues/events{/number}","events_url":"https://api.github.com/repos/NixOS/nixpkgs/events","assignees_url":"https://api.github.com/repos/NixOS/nixpkgs/assignees{/user}","branches_url":"https://api.github.com/repos/NixOS/nixpkgs/branches{/branch}","tags_url":"https://api.github.com/repos/NixOS/nixpkgs/tags","blobs_url":"https://api.github.com/repos/NixOS/nixpkgs/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/NixOS/nixpkgs/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/NixOS/nixpkgs/git/refs{/sha}","trees_url":"https://api.github.com/repos/NixOS/nixpkgs/git/trees{/sha}","statuses_url":"https://api.github.com/repos/NixOS/nixpkgs/statuses/{sha}","languages_url":"https://api.github.com/repos/NixOS/nixpkgs/languages","stargazers_url":"https://api.github.com/repos/NixOS/nixpkgs/stargazers","contributors_url":"https://api.github.com/repos/NixOS/nixpkgs/contributors","subscribers_url":"https://api.github.com/repos/NixOS/nixpkgs/subscribers","subscription_url":"https://api.github.com/repos/NixOS/nixpkgs/subscription","commits_url":"https://api.github.com/repos/NixOS/nixpkgs/commits{/sha}","git_commits_url":"https://api.github.com/repos/NixOS/nixpkgs/git/commits{/sha}","comments_url":"https://api.github.com/repos/NixOS/nixpkgs/comments{/number}","issue_comment_url":"https://api.github.com/repos/NixOS/nixpkgs/issues/comments{/number}","contents_url":"https://api.github.com/repos/NixOS/nixpkgs/contents/{+path}","compare_url":"https://api.github.com/repos/NixOS/nixpkgs/compare/{base}...{head}","merges_url":"https://api.github.com/repos/NixOS/nixpkgs/merges","archive_url":"https://api.github.com/repos/NixOS/nixpkgs/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/NixOS/nixpkgs/downloads","issues_url":"https://api.github.com/repos/NixOS/nixpkgs/issues{/number}","pulls_url":"https://api.github.com/repos/NixOS/nixpkgs/pulls{/number}","milestones_url":"https://api.github.com/repos/NixOS/nixpkgs/milestones{/number}","notifications_url":"https://api.github.com/repos/NixOS/nixpkgs/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/NixOS/nixpkgs/labels{/name}","releases_url":"https://api.github.com/repos/NixOS/nixpkgs/releases{/id}","deployments_url":"https://api.github.com/repos/NixOS/nixpkgs/deployments","created_at":"2012-06-04T02:49:46Z","updated_at":"2018-03-16T22:33:57Z","pushed_at":"2018-03-16T22:29:33Z","git_url":"git://github.com/NixOS/nixpkgs.git","ssh_url":"git@github.com:NixOS/nixpkgs.git","clone_url":"https://github.com/NixOS/nixpkgs.git","svn_url":"https://github.com/NixOS/nixpkgs","homepage":null,"size":745950,"stargazers_count":2289,"watchers_count":2289,"language":"Nix","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":2637,"mirror_url":null,"archived":false,"open_issues_count":3200,"license":{"key":"other","name":"Other","spdx_id":null,"url":null},"forks":2637,"open_issues":3200,"watchers":2289,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/NixOS/nixpkgs/pulls/34971"},"html":{"href":"https://github.com/NixOS/nixpkgs/pull/34971"},"issue":{"href":"https://api.github.com/repos/NixOS/nixpkgs/issues/34971"},"comments":{"href":"https://api.github.com/repos/NixOS/nixpkgs/issues/34971/comments"},"review_comments":{"href":"https://api.github.com/repos/NixOS/nixpkgs/pulls/34971/comments"},"review_comment":{"href":"https://api.github.com/repos/NixOS/nixpkgs/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/NixOS/nixpkgs/pulls/34971/commits"},"statuses":{"href":"https://api.github.com/repos/NixOS/nixpkgs/statuses/5fbbd5e02bf73e3edb589e99b4f95658cf7109cd"}},"author_association":"CONTRIBUTOR"}}
{"actor":{"display_login":"Ekleog"}}