diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2019-07-29 07:05:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-29 07:05:07 +0100 |
| commit | a5542cebd1e621a3ae196002ecb93717aae60e01 (patch) | |
| tree | 187bdccb36fc8c654c01b7a1f43a419d8d03a61f /pkgs | |
| parent | 3b0f0741eaa6b4b36127a11a8838cb11de94fc8e (diff) | |
| parent | 2547d6cb18fa0d15424f2194631684d096453907 (diff) | |
| download | nixlib-a5542cebd1e621a3ae196002ecb93717aae60e01.tar nixlib-a5542cebd1e621a3ae196002ecb93717aae60e01.tar.gz nixlib-a5542cebd1e621a3ae196002ecb93717aae60e01.tar.bz2 nixlib-a5542cebd1e621a3ae196002ecb93717aae60e01.tar.lz nixlib-a5542cebd1e621a3ae196002ecb93717aae60e01.tar.xz nixlib-a5542cebd1e621a3ae196002ecb93717aae60e01.tar.zst nixlib-a5542cebd1e621a3ae196002ecb93717aae60e01.zip | |
Merge pull request #65524 from lopsided98/gn-update
gn: 20181031 -> 20190726
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/build-managers/gn/default.nix | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix index d89c5fdbabde..d2f347901eb5 100644 --- a/pkgs/development/tools/build-managers/gn/default.nix +++ b/pkgs/development/tools/build-managers/gn/default.nix @@ -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 ''; |