diff --git a/.envrc b/.envrc deleted file mode 100644 index 03bb5edd5..000000000 --- a/.envrc +++ /dev/null @@ -1,2 +0,0 @@ -watch_file flake.nix -use flake diff --git a/.gitignore b/.gitignore index fe0dd038f..97ef7bf6c 100644 --- a/.gitignore +++ b/.gitignore @@ -111,5 +111,8 @@ tsconfig.tsbuildinfo # Vscode .vscode/ -# Direnv +# Nix .direnv/ +.envrc +flake.nix +flake.lock diff --git a/flake.lock b/flake.lock deleted file mode 100644 index 040ba3368..000000000 --- a/flake.lock +++ /dev/null @@ -1,130 +0,0 @@ -{ - "nodes": { - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1705856552, - "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1681358109, - "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "96ba1c52e54e74c3197f4d43026b3f3d92e83ff9", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay" - } - }, - "rust-overlay": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1705889935, - "narHash": "sha256-77KPBK5e0ACNzIgJDMuptTtEqKvHBxTO3ksqXHHVO+4=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "e36f66bb10b09f5189dc3b1706948eaeb9a1c555", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { - "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", - "version": 7 -} diff --git a/flake.nix b/flake.nix deleted file mode 100644 index 6c38d298f..000000000 --- a/flake.nix +++ /dev/null @@ -1,96 +0,0 @@ -{ - description = "Build tauri desktop application"; - - inputs = { - nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable; - flake-utils = { - url = "github:numtide/flake-utils"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - rust-overlay.url = "github:oxalica/rust-overlay"; - }; - - outputs = inputs: with inputs; flake-utils.lib.eachDefaultSystem (system: let - pkgs = import nixpkgs { - inherit system; - overlays = [ - rust-overlay.overlays.default - ]; - }; - lib = nixpkgs.lib; - - commonLibraries = with pkgs;[ - # Tauri dependencies - webkitgtk_4_1 - gtk3 - cairo - gdk-pixbuf - glib - dbus - openssl_3 - librsvg - libclang - libappindicator - - # GStreamer required for audio playback JS-side - gst_all_1.gstreamer - gst_all_1.gst-vaapi - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-ugly - gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-base - ]; - - - packages = with pkgs; [ - # More tauri dependencies - curl - wget - pkg-config - libsoup_3 - clang - rustup - - # Frontend dependencies - nodejs - corepack - - # API dependencies / Frontend scripts - python3 - pre-commit - ]; - - in { - devShell = pkgs.mkShell { - buildInputs = commonLibraries ++ packages; - - shellHook = '' - pre-commit install - ''; - - LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath commonLibraries; - - XDG_DATA_DIRS = let - base = pkgs.lib.concatMapStringsSep ":" (x: "${x}/share") [ - pkgs.gnome.adwaita-icon-theme - pkgs.shared-mime-info - ]; - - gsettings-schema = pkgs.lib.concatMapStringsSep ":" (x: "${x}/share/gsettings-schemas/${x.name}") [ - pkgs.glib - pkgs.gsettings-desktop-schemas - pkgs.gtk3 - ]; - - in "${base}:${gsettings-schema}:$XDG_DATA_DIRS"; - - GIO_MODULE_DIR = "${pkgs.glib-networking}/lib/gio/modules/"; - - - # Avoid white screen running with Nix - # https://github.com/tauri-apps/tauri/issues/4315#issuecomment-1207755694 - WEBKIT_DISABLE_COMPOSITING_MODE = 1; - }; - }); -}