Skip to content

Commit 878528e

Browse files
committed
flake.nix cleanup
* Removed verilator overlay. It's sufficient to add the dependencies to buildInputs * Remove unneeded comment and code
1 parent 4688300 commit 878528e

File tree

1 file changed

+3
-29
lines changed

1 file changed

+3
-29
lines changed

flake.nix

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
};
1111
};
1212

13-
outputs = all @ {
13+
outputs = inputs @ {
1414
self,
1515
nixpkgs,
1616
flake-utils,
@@ -33,12 +33,6 @@
3333
packageOverrides = deps.overlay_python;
3434
};
3535
})
36-
# Add some missing dependencies to nixpkgs#verilator
37-
(final: prev: {
38-
verilator = prev.verilator.overrideAttrs (oldAttrs: {
39-
propagatedBuildInputs = [final.zlib final.libelf];
40-
});
41-
})
4236
];
4337
};
4438

@@ -70,22 +64,11 @@
7064
gtkwave
7165
srecord
7266
openfpgaloader
67+
libelf
68+
zlib
7369
# vivado
7470
]);
7571
in {
76-
packages.dockertest = pkgs.dockerTools.buildImage {
77-
name = "hello-docker";
78-
copyToRoot = pkgs.buildEnv {
79-
name = "image-root";
80-
paths = [
81-
pkgs.coreutils
82-
pkgs.sl
83-
];
84-
};
85-
config = {
86-
Cmd = ["${pkgs.sl}/bin/sl"];
87-
};
88-
};
8972
devShells.default = pkgs.mkShell {
9073
name = "labenv";
9174
buildInputs = project_deps;
@@ -154,14 +137,5 @@
154137
// {
155138
overlay = final: prev: {};
156139
overlays = {exampleOverlay = self.overlay;};
157-
158-
# Utilized by `nix run .#<name>`
159-
# apps.x86_64-linux.hello = {
160-
# type = "app";
161-
# program = c-hello.packages.x86_64-linux.hello;
162-
# };
163-
164-
# Utilized by `nix run . -- <args?>`
165-
# defaultApp.x86_64-linux = self.apps.x86_64-linux.hello;
166140
};
167141
}

0 commit comments

Comments
 (0)