Skip to content

Commit 583ad14

Browse files
s0me1newithhand7skaeeraa
authored andcommitted
fix(nix): checks removed (upstream); unwrapped fixed
1 parent e2f6093 commit 583ad14

4 files changed

Lines changed: 40 additions & 86 deletions

File tree

flake.lock

Lines changed: 35 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,6 @@
4646
in {
4747
formatter = forAllSystems (system: nixpkgsFor.${system}.alejandra);
4848

49-
checks = forAllSystems (
50-
system: let
51-
checks' = nixpkgsFor.${system}.callPackage ./nix/checks.nix {inherit self;};
52-
in
53-
lib.filterAttrs (_: lib.isDerivation) checks'
54-
);
55-
5649
devShells = forAllSystems (
5750
system: let
5851
pkgs = nixpkgsFor.${system};

nix/checks.nix

Lines changed: 0 additions & 41 deletions
This file was deleted.

nix/unwrapped.nix

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,17 @@
1414
cmark,
1515
gamemode,
1616
nix-filter,
17+
libnbtplusplus,
1718
extra-cmake-modules,
1819
msaClientID ? null,
19-
gamemodeSupport ? stdenv.isLinux,
20-
version,
21-
libnbtplusplus,
20+
gamemodeSupport ? stdenv.hostPlatform.isLinux,
2221
}:
2322
assert lib.assertMsg (
24-
gamemodeSupport -> stdenv.isLinux
23+
gamemodeSupport -> stdenv.hostPlatform.isLinux
2524
) "gamemodeSupport is only available on Linux.";
26-
let
27-
version = self.shortRev or self.dirtyShortRev or "_git";
28-
in
2925
stdenv.mkDerivation {
3026
pname = "freesmlauncher-unwrapped";
31-
inherit version
27+
version = self.shortRev or self.dirtyShortRev or "_git";
3228

3329
src = nix-filter.lib {
3430
root = self;
@@ -113,4 +109,4 @@ assert lib.assertMsg (
113109
kaeeraa
114110
];
115111
};
116-
}
112+
}

0 commit comments

Comments
 (0)