diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix index c3af8fe72dd0..33386b79dc0a 100644 --- a/pkgs/development/tools/build-managers/gn/default.nix +++ b/pkgs/development/tools/build-managers/gn/default.nix @@ -1,4 +1,4 @@ -{ callPackage, ... } @ args: +{ callPackage, ... }@args: callPackage ./generic.nix args { # Note: Please use the recommended version for Chromium stabe, i.e. from diff --git a/pkgs/development/tools/build-managers/gn/generic.nix b/pkgs/development/tools/build-managers/gn/generic.nix index 4fc2fd6b53b8..218a46d3fb98 100644 --- a/pkgs/development/tools/build-managers/gn/generic.nix +++ b/pkgs/development/tools/build-managers/gn/generic.nix @@ -1,9 +1,22 @@ -{ stdenv, lib, fetchgit, fetchpatch, cctools, darwin, writeText -, ninja, python3 -, ... +{ + stdenv, + lib, + fetchgit, + fetchpatch, + cctools, + darwin, + writeText, + ninja, + python3, + ... }: -{ rev, revNum, version, sha256 }: +{ + rev, + revNum, + version, + sha256, +}: let revShort = builtins.substring 0 7 rev; @@ -17,7 +30,8 @@ let #endif // OUT_LAST_COMMIT_POSITION_H_ ''; -in stdenv.mkDerivation { +in +stdenv.mkDerivation { pname = "gn-unstable"; inherit version; @@ -36,16 +50,23 @@ in stdenv.mkDerivation { }) ]; - nativeBuildInputs = [ ninja python3 ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin; with apple_sdk.frameworks; [ - libobjc - cctools + nativeBuildInputs = [ + ninja + python3 + ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin; + with apple_sdk.frameworks; + [ + libobjc + cctools - # frameworks - ApplicationServices - Foundation - AppKit - ]); + # frameworks + ApplicationServices + Foundation + AppKit + ] + ); env.NIX_CFLAGS_COMPILE = "-Wno-error"; @@ -67,6 +88,10 @@ in stdenv.mkDerivation { homepage = "https://gn.googlesource.com/gn"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = with maintainers; [ stesie matthewbauer primeos ]; + maintainers = with maintainers; [ + stesie + matthewbauer + primeos + ]; }; } diff --git a/pkgs/development/tools/build-managers/gn/rev1924.nix b/pkgs/development/tools/build-managers/gn/rev1924.nix index 1b17328f2e09..946707ef28d3 100644 --- a/pkgs/development/tools/build-managers/gn/rev1924.nix +++ b/pkgs/development/tools/build-managers/gn/rev1924.nix @@ -1,4 +1,4 @@ -{ callPackage, ... } @ args: +{ callPackage, ... }@args: callPackage ./generic.nix args { rev = "24e2f7df92641de0351a96096fb2c490b2436bb8";