Theaninova/openstapps
1
0
Fork 0
mirror of https://gitlab.com/openstapps/openstapps.git synced 2026-01-22 17:42:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: update nix dependencies

Browse Source
This commit is contained in:
Thea Schöbl
2024-09-30 13:00:59 +02:00
parent ce5016a992
commit 0c49fd8c34
1 changed files with 80 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
flake.nix
View File

@@ -4,22 +4,37 @@
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
}; };
outputs = { outputs =
{
self, self,
nixpkgs, nixpkgs,
flake-utils, flake-utils,
}: let }:
let
aapt2buildToolsVersion = "33.0.2"; aapt2buildToolsVersion = "33.0.2";
in in
flake-utils.lib.eachDefaultSystem (system: let flake-utils.lib.eachDefaultSystem (
system:
let
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
overlays = [ overlays = [
(final: prev: rec { (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 { android = prev.androidenv.composeAndroidPackages {
buildToolsVersions = ["30.0.3" aapt2buildToolsVersion]; buildToolsVersions = [
platformVersions = ["33"]; "34.0.0"
aapt2buildToolsVersion
];
platformVersions = [ "34" ];
}; };
cypress = prev.cypress.overrideAttrs (cyPrev: rec { cypress = prev.cypress.overrideAttrs (cyPrev: rec {
version = "13.2.0"; version = "13.2.0";
@@ -29,6 +44,7 @@
}; };
}); });
nodejs = prev.nodejs_18; nodejs = prev.nodejs_18;
corepack = prev.corepack_18;
}) })
]; ];
config = { config = {
@@ -46,7 +62,8 @@
export LD_LIBRARY_PATH=/usr/lib:/usr/lib32 export LD_LIBRARY_PATH=/usr/lib:/usr/lib32
''; '';
}; };
in { in
{
devShell = pkgs.mkShell rec { devShell = pkgs.mkShell rec {
nativeBuildInputs = [ androidFhs ]; nativeBuildInputs = [ androidFhs ];
buildInputs = with pkgs; [ buildInputs = with pkgs; [
@@ -67,5 +84,6 @@
CYPRESS_INSTALL_BINARY = "0"; CYPRESS_INSTALL_BINARY = "0";
CYPRESS_RUN_BINARY = "${pkgs.cypress}/bin/Cypress"; CYPRESS_RUN_BINARY = "${pkgs.cypress}/bin/Cypress";
}; };
}); }
);
} }