Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/development/tools/build-managers/gn/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ callPackage, ... } @ args:
{ callPackage, ... }@args:

callPackage ./generic.nix args {
# Note: Please use the recommended version for Chromium stabe, i.e. from
Expand Down
55 changes: 40 additions & 15 deletions pkgs/development/tools/build-managers/gn/generic.nix
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -17,7 +30,8 @@ let
#endif // OUT_LAST_COMMIT_POSITION_H_
'';

in stdenv.mkDerivation {
in
stdenv.mkDerivation {
pname = "gn-unstable";
inherit version;

Expand All @@ -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";

Expand All @@ -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
];
};
}
8 changes: 0 additions & 8 deletions pkgs/development/tools/build-managers/gn/rev1924.nix

This file was deleted.

1 change: 1 addition & 0 deletions pkgs/top-level/aliases.nix
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,7 @@ mapAliases {
gnuradio3_9 = throw "gnuradio3_9 has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28
gnuradio3_9Minimal = throw "gnuradio3_9Minimal has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28
gnuradio3_9Packages = throw "gnuradio3_9Minimal has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28
gn1924 = throw "gn1924 has been removed because it was broken and no longer used by envoy."; # Added 2024-11-03
gobby5 = throw "'gobby5' has been renamed to/replaced by 'gobby'"; # Converted to throw 2024-10-17
gradle_6 = throw "Gradle 6 has been removed, as it is end-of-life (https://endoflife.date/gradle) and has many vulnerabilities that are not resolved until Gradle 7."; # Added 2024-10-30
gradle_6-unwrapped = throw "Gradle 6 has been removed, as it is end-of-life (https://endoflife.date/gradle) and has many vulnerabilities that are not resolved until Gradle 7."; # Added 2024-10-30
Expand Down
1 change: 0 additions & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17886,7 +17886,6 @@ with pkgs;
nimbo = with python3Packages; callPackage ../applications/misc/nimbo { };

gn = callPackage ../development/tools/build-managers/gn { };
gn1924 = callPackage ../development/tools/build-managers/gn/rev1924.nix { };

nixbang = callPackage ../development/tools/misc/nixbang {
pythonPackages = python3Packages;
Expand Down