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

aseprite.skia: Override the gn version to fix the build

Browse Source 
With #83290 merged the build would fail during the configuration phase:
```
configuring
ERROR at //gn/BUILDCONFIG.gn:85:14: Script returned non-zero exit code.
  is_clang = exec_script("gn/is_clang.py",
             ^----------
Current dir: /build/source/out/Release/
Command: python /build/source/gn/gn/is_clang.py cc c++
Returned 2.
stderr:

python: can't open file '/build/source/gn/gn/is_clang.py': [Errno 2] No such file or directory
```
This commit is contained in:
Michael Weiss 2020-03-25 23:32:03 +01:00
parent a1b4bfe34f
commit ad66bbd98b
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
2 changed files with 12 additions and 2 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