|
48 | 48 | openssl |
49 | 49 | pango |
50 | 50 | pixman |
51 | | -pkg-config |
| 51 | +pkg-config-unwrapped |
52 | 52 | postgresql |
53 | 53 | protobuf |
54 | 54 | protoc-gen-go |
55 | 55 | ripgrep |
| 56 | +sapling |
56 | 57 | shellcheck |
57 | 58 | shfmt |
58 | 59 | sqlc |
|
83 | 84 | baseDevEnvImage=pkgs.dockerTools.pullImage{ |
84 | 85 | imageName="ubuntu"; |
85 | 86 | imageDigest="sha256:7a520eeb6c18bc6d32a21bb7edcf673a7830813c169645d51c949cecb62387d0"; |
86 | | -sha256="ajZzFSG/q7F5wAXfBOPpYBT+aVy8lqAXtBzkmAe2SeE="; |
| 87 | +sha256="090zricz7n1kbphd7gwhvavj7m1j7bhh4aq3c3mrik5q8pxh4j58"; |
87 | 88 | finalImageName="ubuntu"; |
88 | 89 | finalImageTag="lunar"; |
89 | 90 | }; |
|
109 | 110 | mkdir -p /etc/init.d |
110 | 111 | ''; |
111 | 112 | }; |
| 113 | +allPackages=devShellPackages++devImagePackages; |
112 | 114 | # Environment variables that live in `/etc/environment` in the container. |
113 | 115 | # These will also be applied to the container config. |
114 | 116 | devEnvVars=[ |
115 | | -"PATH=${pkgs.lib.makeBinPath(devShellPackages++devImagePackages)}:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/home/coder/go/bin" |
| 117 | +"PATH=${pkgs.lib.makeBinPath(allPackages)}:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/home/coder/go/bin" |
| 118 | +"LD_LIBRARY_PATH=${pkgs.lib.makeLibraryPath(allPackages)}" |
| 119 | +"PKG_CONFIG_PATH=${pkgs.lib.makeSearchPathOutput"lib/pkgconfig""lib/pkgconfig"allPackages}" |
116 | 120 | # This setting prevents Go from using the public checksum database for |
117 | 121 | # our module path prefixes. It is required because these are in private |
118 | 122 | # repositories that require authentication. |
|