diff options
| author | swirl <roachh@protonmail.com> | 2022-01-13 13:55:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-13 13:55:29 -0500 |
| commit | b07853c9ef6063fe0d6d9065acdd598841c62a14 (patch) | |
| tree | 2581f15ecd1a07fe47b6ebe90a2595b9fdfb1809 | |
| parent | 2301a934b04861af010da2f6d5c885e52e002413 (diff) | |
| parent | b635a7e693569fc566df1860a4ffd1b225c69de6 (diff) | |
| download | PrismLauncher-b07853c9ef6063fe0d6d9065acdd598841c62a14.tar.gz PrismLauncher-b07853c9ef6063fe0d6d9065acdd598841c62a14.tar.bz2 PrismLauncher-b07853c9ef6063fe0d6d9065acdd598841c62a14.zip | |
Merge pull request #61 from meguminloli/develop
| -rw-r--r-- | flake.lock | 6 | ||||
| -rw-r--r-- | flake.nix | 39 | ||||
| -rw-r--r-- | packages/nix/NIX.md | 4 |
3 files changed, 18 insertions, 31 deletions
@@ -49,11 +49,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1641528457, - "narHash": "sha256-FyU9E63n1W7Ql4pMnhW2/rO9OftWZ37pLppn/c1aisY=", + "lastModified": 1641887635, + "narHash": "sha256-kDGpufwzVaiGe5e1sBUBPo9f1YN+nYHJlYqCaVpZTQQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ff377a78794d412a35245e05428c8f95fef3951f", + "rev": "b2737d4980a17cc2b7d600d7d0b32fd7333aca88", "type": "github" }, "original": { @@ -2,7 +2,7 @@ description = "PolyMC flake"; inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; inputs.flake-utils.url = "github:numtide/flake-utils"; - inputs.flake-compat = { + inputs.flake-compat = { url = "github:edolstra/flake-compat"; flake = false; }; @@ -15,13 +15,14 @@ flake = false; }; - outputs = inputs@{ self, nixpkgs, flake-utils, libnbtplusplus, quazip, ... }: - flake-utils.lib.eachSystem [ "x86_64-linux" "aarch64-linux" ] (system: - let - pkgs = import nixpkgs { - inherit system; - }; - + outputs = args@{ self, nixpkgs, flake-utils, libnbtplusplus, quazip, ... }: + { + overlay = final: prev: { + inherit (self.packages.${final.system}) polymc; + }; + } // flake-utils.lib.eachDefaultSystem (system: + let pkgs = import nixpkgs { inherit system; }; + in { packages = { polymc = pkgs.libsForQt5.callPackage ./packages/nix/polymc { inherit self; @@ -29,27 +30,13 @@ submoduleNbt = libnbtplusplus; }; }; - - # 'nix flake check' fails - overlay = (final: prev: rec { - polymc = prev.libsForQt5.callPackage ./packages/nix/polymc { - inherit self; - submoduleQuazip = quazip; - submoduleNbt = libnbtplusplus; - }; - }); - apps = { polymc = flake-utils.lib.mkApp { name = "polymc"; - drv = packages.polymc; + drv = self.packages.${system}.polymc; }; }; - in - { - inherit packages overlay apps; - defaultPackage = packages.polymc; - defaultApp = apps.polymc; - } - ); + defaultPackage = self.packages.${system}.polymc; + defaultApp = self.apps.${system}.polymc; + }); } diff --git a/packages/nix/NIX.md b/packages/nix/NIX.md index f778dac1..1ceba9a3 100644 --- a/packages/nix/NIX.md +++ b/packages/nix/NIX.md @@ -8,7 +8,7 @@ inputs = { ... -nixpkgs.overlays = [ inputs.polymc.overlay.${system} ]; ## Within configuration.nix +nixpkgs.overlays = [ inputs.polymc.overlay ]; ## Within configuration.nix environment.systemPackages = with pkgs; [ polymc ]; ## ``` @@ -28,4 +28,4 @@ nixpkgs.overlays = [ ]; environment.systemPackages = with pkgs; [ polymc ]; -```
\ No newline at end of file +``` |