Skip to content

Commit da46df7

Browse files
committed
Updates flake.nix
1 parent efb8088 commit da46df7

2 files changed

Lines changed: 28 additions & 10 deletions

File tree

flake.lock

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

flake.nix

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,42 @@
99
let
1010
pkgs = nixpkgs.legacyPackages.${system};
1111
on = opam-nix.lib.${system};
12+
1213
localPackagesQuery = builtins.mapAttrs (_: pkgs.lib.last)
1314
(on.listRepo (on.makeOpamRepo ./.));
15+
1416
devPackagesQuery = {
1517
ocaml-lsp-server = "*";
1618
ocp-indent = "*";
1719
merlin = "*";
1820
};
21+
1922
query = devPackagesQuery // {
2023
ocaml-base-compiler = "*";
2124
};
22-
scope = on.buildDuneProject { } "polytt" ./. query;
25+
26+
scope = on.buildDuneProject { pkgs = pkgs.pkgsStatic; } "polytt" ./. query;
27+
28+
overlay = self: super: {
29+
# Prevent unnecessary dependencies on the resulting derivation
30+
polytt = super.polytt.overrideAttrs (_: {
31+
removeOcamlReferences = true;
32+
postFixup = "rm -rf $out/nix-support";
33+
});
34+
};
35+
36+
scope' = scope.overrideScope' overlay;
37+
38+
# Packages from devPackagesQuery
2339
devPackages = builtins.attrValues
24-
(pkgs.lib.getAttrs (builtins.attrNames devPackagesQuery) scope);
40+
(pkgs.lib.getAttrs (builtins.attrNames devPackagesQuery) scope');
41+
42+
# Packages in this workspace
2543
packages =
26-
pkgs.lib.getAttrs (builtins.attrNames localPackagesQuery) scope;
44+
pkgs.lib.getAttrs (builtins.attrNames localPackagesQuery) scope';
2745
in
2846
{
29-
legacyPackages = scope;
47+
legacyPackages = scope';
3048

3149
packages = packages // { default = packages.polytt; };
3250

0 commit comments

Comments
 (0)