mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 14:11:36 +00:00
Code Issues Wiki Activity

gn: 20181031 -> 20190726

Browse source
This commit is contained in:
Ben Wolsieffer 2019-07-28 15:47:26 -04:00
parent 9024838885
commit 2547d6cb18
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/development/tools/build-managers/gn/default.nix
View file

@ -2,8 +2,8 @@
, git, ninja, python2 }:
let
rev = "96ff462cddf35f98e25fd5d098fc27bc81eab94a";
sha256 = "1ny23sprl7ygb2lpdnqxv60m8kaf4h2dmpqjp61l5vc2s7f32g97";
rev = "0bc16a82ea001ad9c94b870f097034be5c8e40b4";
sha256 = "01as6q5xr0smiihm9m1x74pykd2jcqi4rhv8irmv43v2f0pxwzi5";
shortRev = builtins.substring 0 7 rev;
lastCommitPosition = writeText "last_commit_position.h" ''
@ -18,19 +18,13 @@ let
in
stdenv.mkDerivation rec {
name = "gn-${version}";
version = "20181031";
version = "20190726";
src = fetchgit {
url = "https://gn.googlesource.com/gn";
inherit rev sha256;
};
postPatch = ''
# FIXME Needed with old Apple SDKs
substituteInPlace base/mac/foundation_util.mm \
--replace "NSArray<NSString*>*" "NSArray*"
'';
nativeBuildInputs = [ ninja python2 git ];
buildInputs = lib.optionals stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [
libobjc
@ -43,7 +37,7 @@ stdenv.mkDerivation rec {
]);
buildPhase = ''
python build/gen.py --no-sysroot --no-last-commit-position
python build/gen.py --no-last-commit-position
ln -s ${lastCommitPosition} out/last_commit_position.h
ninja -j $NIX_BUILD_CORES -C out gn
'';