0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed flake.nix

Browse Source 
removed result
This commit is contained in:
meguminloli 2022-01-13 12:57:35 +02:00
parent 49c2bd477c
commit 60e9d2754a
2 changed files with 29 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flake.lock
View File

@ -49,11 +49,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1641528457, "lastModified": 1641887635,
"narHash": "sha256-FyU9E63n1W7Ql4pMnhW2/rO9OftWZ37pLppn/c1aisY=", "narHash": "sha256-kDGpufwzVaiGe5e1sBUBPo9f1YN+nYHJlYqCaVpZTQQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ff377a78794d412a35245e05428c8f95fef3951f", "rev": "b2737d4980a17cc2b7d600d7d0b32fd7333aca88",
"type": "github" "type": "github"
}, },
"original": { "original": {

39
flake.nix
View File

@ -15,41 +15,30 @@
flake = false; flake = false;
}; };
outputs = inputs@{ self, nixpkgs, flake-utils, libnbtplusplus, quazip, ... }: outputs = args@{ self, nixpkgs, flake-utils, libnbtplusplus, quazip, ... }:
flake-utils.lib.eachSystem [ "x86_64-linux" "aarch64-linux" ] (system: {
let overlay = final: prev: {
pkgs = import nixpkgs { inherit (self.packages.${final.system})
polymc;
};
} // flake-utils.lib.eachSystem [ "x86_64-linux" "aarch64-linux"] (system:
let pkgs = import nixpkgs {
inherit system; inherit system;
}; };
in {
packages = { defaultPackage = self.packages.${system}.polymc;
packages = rec {
polymc = pkgs.libsForQt5.callPackage ./packages/nix/polymc { polymc = pkgs.libsForQt5.callPackage ./packages/nix/polymc {
inherit self; inherit self;
submoduleQuazip = quazip; submoduleQuazip = quazip;
submoduleNbt = libnbtplusplus; submoduleNbt = libnbtplusplus;
}; };
}; };
apps = rec {
# '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 { polymc = flake-utils.lib.mkApp {
name = "polymc"; name = "polymc";
drv = packages.polymc; drv = self.packages.${system}.polymc;
}; };
}; };
in });
{
inherit packages overlay apps;
defaultPackage = packages.polymc;
defaultApp = apps.polymc;
}
);
} }