diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-01 09:44:06 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-01 09:44:06 +0200 |
commit | 4ca8e53e1ddb2f2f1e5520be33654c33481faae0 (patch) | |
tree | 94896f54f338cc97a1e43adf3dcbdff15d5a512c /pkgs/development/tools/build-managers/gn/default.nix | |
parent | 59ac7e16347e2e841e24d3dd959b9fc5dab5fdc8 (diff) | |
parent | 55e4555b77ff7506579c1d4f5d9b562ca6e853b4 (diff) | |
download | nixpkgs-4ca8e53e1ddb2f2f1e5520be33654c33481faae0.tar nixpkgs-4ca8e53e1ddb2f2f1e5520be33654c33481faae0.tar.gz nixpkgs-4ca8e53e1ddb2f2f1e5520be33654c33481faae0.tar.bz2 nixpkgs-4ca8e53e1ddb2f2f1e5520be33654c33481faae0.tar.lz nixpkgs-4ca8e53e1ddb2f2f1e5520be33654c33481faae0.tar.xz nixpkgs-4ca8e53e1ddb2f2f1e5520be33654c33481faae0.tar.zst nixpkgs-4ca8e53e1ddb2f2f1e5520be33654c33481faae0.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/tools/build-managers/gn/default.nix')
-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 d89c5fdbabd..34d19b61694 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 = "64b846c96daeb3eaf08e26d8a84d8451c6cb712b"; + sha256 = "1v2kzsshhxn0ck6gd5w16gi2m3higwd9vkyylmsczxfxnw8skgpy"; 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 = "20190403"; 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 ''; |