public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #83290 from primeos/gn 

gn: 20190403 -> 2020-03-09
This commit is contained in:
Michael Weiss 2020-03-26 01:13:23 +01:00 committed by GitHub
parent 83d1e9eb1f ad66bbd98b
commit 7525624b6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/editors/aseprite/default.nix
View File

@ -98,6 +98,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
passthru = { inherit skia; };
meta = with lib; { meta = with lib; {
homepage = https://www.aseprite.org/; homepage = https://www.aseprite.org/;
description = "Animated sprite editor & pixel art tool"; description = "Animated sprite editor & pixel art tool";

12
pkgs/applications/editors/aseprite/skia.nix
View File

@ -6,6 +6,14 @@
let let
# skia-deps.nix is generated by: ./skia-make-deps.sh 'angle2|dng_sdk|piex|sfntly' # skia-deps.nix is generated by: ./skia-make-deps.sh 'angle2|dng_sdk|piex|sfntly'
depSrcs = import ./skia-deps.nix { inherit fetchgit; }; depSrcs = import ./skia-deps.nix { inherit fetchgit; };
gnOld = gn.overrideAttrs (oldAttrs: rec {
version = "20190403";
src = fetchgit {
url = "https://gn.googlesource.com/gn";
rev = "64b846c96daeb3eaf08e26d8a84d8451c6cb712b";
sha256 = "1v2kzsshhxn0ck6gd5w16gi2m3higwd9vkyylmsczxfxnw8skgpy";
};
});
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "skia-aseprite-m71"; name = "skia-aseprite-m71";
@ -14,11 +22,11 @@ stdenv.mkDerivation {
owner = "aseprite"; owner = "aseprite";
repo = "skia"; repo = "skia";
# latest commit from aseprite-m71 branch # latest commit from aseprite-m71 branch
rev = "89e4ca4352d05adc892f5983b108433f29b2c0c2"; rev = "89e4ca4352d05adc892f5983b108433f29b2c0c2"; # TODO: Remove the gnOld override
sha256 = "0n3vrkswvi6rib9zv2pzi18h3j5wm7flmgkgaikcm6q7iw4l2c7x"; sha256 = "0n3vrkswvi6rib9zv2pzi18h3j5wm7flmgkgaikcm6q7iw4l2c7x";
}; };
nativeBuildInputs = [ python2 gn ninja ]; nativeBuildInputs = [ python2 gnOld ninja ];
buildInputs = [ buildInputs = [
fontconfig expat icu58 libglvnd libjpeg libpng libwebp zlib fontconfig expat icu58 libglvnd libjpeg libpng libwebp zlib

30
pkgs/development/tools/build-managers/gn/default.nix
View File

@ -1,31 +1,37 @@
{ stdenv, lib, fetchgit, darwin, writeText { stdenv, lib, fetchgit, darwin, writeText
, git, ninja, python3 }: , ninja, python3
}:
let let
rev = "64b846c96daeb3eaf08e26d8a84d8451c6cb712b"; # Note: Please use the recommended version for Chromium, e.g.:
sha256 = "1v2kzsshhxn0ck6gd5w16gi2m3higwd9vkyylmsczxfxnw8skgpy"; # https://git.archlinux.org/svntogit/packages.git/tree/trunk/chromium-gn-version.sh?h=packages/gn
rev = "fd3d768bcfd44a8d9639fe278581bd9851d0ce3a";
revNum = "1718"; # git describe HEAD --match initial-commit | cut -d- -f3
version = "2020-03-09";
sha256 = "1asc14y8by7qcn10vbk467hvx93s30pif8r0brissl0sihsaqazr";
shortRev = builtins.substring 0 7 rev; revShort = builtins.substring 0 7 rev;
lastCommitPosition = writeText "last_commit_position.h" '' lastCommitPosition = writeText "last_commit_position.h" ''
#ifndef OUT_LAST_COMMIT_POSITION_H_ #ifndef OUT_LAST_COMMIT_POSITION_H_
#define OUT_LAST_COMMIT_POSITION_H_ #define OUT_LAST_COMMIT_POSITION_H_
#define LAST_COMMIT_POSITION "(${shortRev})" #define LAST_COMMIT_POSITION_NUM ${revNum}
#define LAST_COMMIT_POSITION "${revNum} (${revShort})"
#endif // OUT_LAST_COMMIT_POSITION_H_ #endif // OUT_LAST_COMMIT_POSITION_H_
''; '';
in in stdenv.mkDerivation {
stdenv.mkDerivation { pname = "gn-unstable";
pname = "gn"; inherit version;
version = "20190403";
src = fetchgit { src = fetchgit {
# Note: The TAR-Archives (+archive/${rev}.tar.gz) are not deterministic!
url = "https://gn.googlesource.com/gn"; url = "https://gn.googlesource.com/gn";
inherit rev sha256; inherit rev sha256;
}; };
nativeBuildInputs = [ ninja python3 git ]; nativeBuildInputs = [ ninja python3 ];
buildInputs = lib.optionals stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [ buildInputs = lib.optionals stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [
libobjc libobjc
cctools cctools
@ -49,8 +55,8 @@ stdenv.mkDerivation {
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
meta = with lib; { meta = with lib; {
description = "A meta-build system that generates NinjaBuild files"; description = "A meta-build system that generates build files for Ninja";
homepage = https://gn.googlesource.com/gn; homepage = "https://gn.googlesource.com/gn";
license = licenses.bsd3; license = licenses.bsd3;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ stesie matthewbauer ]; maintainers = with maintainers; [ stesie matthewbauer ];