From a4cc23e9a86bf78f4281d4f2a76779cbdf8fc4c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= Date: Tue, 2 Jan 2024 13:10:54 +0100 Subject: [PATCH] feat: add direnv for nix feat: update nix flake to not rely on buildFHSUserEnv --- .envrc | 1 + .gitignore | 1 + flake.lock | 34 +++++++++++++ flake.nix | 142 ++++++++++++++++++++++++++--------------------------- 4 files changed, 106 insertions(+), 72 deletions(-) create mode 100644 .envrc diff --git a/.envrc b/.envrc new file mode 100644 index 00000000..3550a30f --- /dev/null +++ b/.envrc @@ -0,0 +1 @@ +use flake diff --git a/.gitignore b/.gitignore index f9869fa4..d7808117 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,7 @@ report-junit.xml # NixOS flake result hsperfdata_root +.direnv/ # Directory for instrumented libs generated by jscoverage/JSCover lib-cov diff --git a/flake.lock b/flake.lock index ff6b166a..e3eacb52 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,23 @@ { "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1701626906, @@ -18,8 +36,24 @@ }, "root": { "inputs": { + "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index cc861a92..12461e7d 100644 --- a/flake.nix +++ b/flake.nix @@ -1,77 +1,75 @@ { description = "A Nix-flake-based development environment for OpenStApps"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - outputs = { self, nixpkgs }: - let - buildToolsVersion = "30.0.3"; - overlays = [ - (final: prev: rec { - nodejs = prev.nodejs-18_x; - pnpm = prev.nodePackages.pnpm; - chrome = prev.google-chrome; - firefox = prev.firefox; - webkit = prev.epiphany; # Safari-ish browser - android = prev.androidenv.composeAndroidPackages { - buildToolsVersions = [ "${buildToolsVersion}" ]; - platformVersions = [ "33" ]; - }; - cypress = prev.cypress.overrideAttrs(cyPrev: rec { - version = "13.2.0"; - src = prev.fetchzip { - url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - hash = "sha256-9o0nprGcJhudS1LNm+T7Vf0Dwd1RBauYKI+w1FBQ3ZM="; + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + flake-utils.url = "github:numtide/flake-utils"; + }; + outputs = { + self, + nixpkgs, + flake-utils, + }: let + aapt2buildToolsVersion = "33.0.2"; + in + 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])); + android = prev.androidenv.composeAndroidPackages { + buildToolsVersions = ["30.0.3" aapt2buildToolsVersion]; + platformVersions = ["33"]; }; - }); - }) - ]; - # TODO: aarch64-linux, x68_64-darwin, aarch64-darwin - supportedSystems = [ "x86_64-linux" ]; - forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f { - pkgs = import nixpkgs { - inherit overlays system; - config = { - allowUnfree = true; - android_sdk.accept_license = true; - }; + cypress = prev.cypress.overrideAttrs (cyPrev: rec { + version = "13.2.0"; + src = prev.fetchzip { + url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; + hash = "sha256-9o0nprGcJhudS1LNm+T7Vf0Dwd1RBauYKI+w1FBQ3ZM="; + }; + }); + }) + ]; + config = { + allowUnfree = true; + android_sdk.accept_license = true; }; - }); - in - { - devShells = forEachSupportedSystem ({ pkgs }: - let - python = (pkgs.python311.withPackages(ps: with ps; [ brotli fonttools ] ++ (with fonttools.optional-dependencies; [ ufo lxml unicode woff ]))); - in - { - default = (pkgs.buildFHSUserEnv { - name = "StApps Dev"; - targetPkgs = pkgs: with pkgs; [ - nodejs - pnpm - python - docker - # tools - curl - jq - # browsers - firefox - chrome - webkit - cypress - # android - jdk17 - android.androidsdk - musl - ]; - runScript = "bash"; - profile = '' - export CYPRESS_INSTALL_BINARY=0 - export CYPRESS_RUN_BINARY=${pkgs.cypress}/bin/Cypress - export ANDROID_SDK_ROOT=${pkgs.android.androidsdk}/libexec/android-sdk - export ANDROID_JAVA_HOME=${pkgs.jdk.home} - export DOCKER_HOST=unix:///run/user/1000/docker.sock - { dockerd-rootless & } 2>/dev/null - ''; - }).env; - }); - }; + }; + androidFhs = pkgs.buildFHSUserEnv { + name = "android-env"; + targetPkgs = pkgs: with pkgs; []; + runScript = "bash"; + profile = '' + export ALLOW_NINJA_ENV=true + export USE_CCACHE=1 + export LD_LIBRARY_PATH=/usr/lib:/usr/lib32 + ''; + }; + in { + devShell = pkgs.mkShell rec { + nativeBuildInputs = [androidFhs]; + buildInputs = with pkgs; [ + nodejs-18_x + nodePackages.pnpm + # tools + curl + jq + fontMin + # browsers + firefox + google-chrome + epiphany # Safari-ish browser + cypress + # android + jdk17 + android.androidsdk + musl + ]; + ANDROID_JAVA_HOME = "${pkgs.jdk.home}"; + ANDROID_SDK_ROOT = "${pkgs.android.androidsdk}/libexec/android-sdk"; + GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_SDK_ROOT}/build-tools/${aapt2buildToolsVersion}/aapt2"; + CYPRESS_INSTALL_BINARY = "0"; + CYPRESS_RUN_BINARY = "${pkgs.cypress}/bin/Cypress"; + }; + }); }