fix: add sapling to the nix flake

kylecarbs · kylecarbs · commit 5333233b0808 · 2023-08-18T16:36:16.000-05:00
diff --git a/flake.nix b/flake.nix
@@ -48,11 +48,12 @@
           openssl
           pango
           pixman
-          pkg-config
+          pkg-config-unwrapped
           postgresql
           protobuf
           protoc-gen-go
           ripgrep
+          sapling
           shellcheck
           shfmt
           sqlc
@@ -83,7 +84,7 @@
         baseDevEnvImage = pkgs.dockerTools.pullImage {
           imageName = "ubuntu";
           imageDigest = "sha256:7a520eeb6c18bc6d32a21bb7edcf673a7830813c169645d51c949cecb62387d0";
-          sha256 = "ajZzFSG/q7F5wAXfBOPpYBT+aVy8lqAXtBzkmAe2SeE=";
+          sha256 = "090zricz7n1kbphd7gwhvavj7m1j7bhh4aq3c3mrik5q8pxh4j58";
           finalImageName = "ubuntu";
           finalImageTag = "lunar";
         };
@@ -109,10 +110,13 @@
             mkdir -p /etc/init.d
           '';
         };
+        allPackages = devShellPackages ++ devImagePackages;
         # Environment variables that live in `/etc/environment` in the container.
         # These will also be applied to the container config.
         devEnvVars = [
-          "PATH=${pkgs.lib.makeBinPath (devShellPackages ++ devImagePackages)}:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/home/coder/go/bin"
+          "PATH=${pkgs.lib.makeBinPath (allPackages)}:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/home/coder/go/bin"
+          "LD_LIBRARY_PATH=${pkgs.lib.makeLibraryPath (allPackages)}"
+          "PKG_CONFIG_PATH=${pkgs.lib.makeSearchPathOutput "lib/pkgconfig" "lib/pkgconfig" allPackages}"
           # This setting prevents Go from using the public checksum database for
           # our module path prefixes. It is required because these are in private
           # repositories that require authentication.
