refactor: update nix dependencies

This commit is contained in:
2024-09-30 13:00:59 +02:00
parent ce5016a992
commit 0c49fd8c34

View File

@@ -4,22 +4,37 @@
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
flake-utils.url = "github:numtide/flake-utils";
};
outputs = {
outputs =
{
self,
nixpkgs,
flake-utils,
}: let
}:
let
aapt2buildToolsVersion = "33.0.2";
in
flake-utils.lib.eachDefaultSystem (system: let
flake-utils.lib.eachDefaultSystem (
system:
let
pkgs = import nixpkgs {
inherit system;
overlays = [
(final: prev: rec {
fontMin = prev.python311.withPackages (ps: with ps; [brotli fonttools] ++ (with fonttools.optional-dependencies; [woff]));
fontMin = prev.python311.withPackages (
ps:
with ps;
[
brotli
fonttools
]
++ (with fonttools.optional-dependencies; [ woff ])
);
android = prev.androidenv.composeAndroidPackages {
buildToolsVersions = ["30.0.3" aapt2buildToolsVersion];
platformVersions = ["33"];
buildToolsVersions = [
"34.0.0"
aapt2buildToolsVersion
];
platformVersions = [ "34" ];
};
cypress = prev.cypress.overrideAttrs (cyPrev: rec {
version = "13.2.0";
@@ -29,6 +44,7 @@
};
});
nodejs = prev.nodejs_18;
corepack = prev.corepack_18;
})
];
config = {
@@ -38,7 +54,7 @@
};
androidFhs = pkgs.buildFHSUserEnv {
name = "android-env";
targetPkgs = pkgs: with pkgs; [];
targetPkgs = pkgs: with pkgs; [ ];
runScript = "bash";
profile = ''
export ALLOW_NINJA_ENV=true
@@ -46,9 +62,10 @@
export LD_LIBRARY_PATH=/usr/lib:/usr/lib32
'';
};
in {
in
{
devShell = pkgs.mkShell rec {
nativeBuildInputs = [androidFhs];
nativeBuildInputs = [ androidFhs ];
buildInputs = with pkgs; [
nodejs
corepack
@@ -67,5 +84,6 @@
CYPRESS_INSTALL_BINARY = "0";
CYPRESS_RUN_BINARY = "${pkgs.cypress}/bin/Cypress";
};
});
}
);
}