From 59f74814111045b6d74d2a8f5b4f4bfbd1cacd85 Mon Sep 17 00:00:00 2001 From: William Carroll Date: Mon, 17 Aug 2020 10:08:32 +0100 Subject: Revise previous opinions about absolute paths GT Unforeseen problem: `buildkite-agent` runs its builds in a separate directory, so if I want the `nix-build` command to build the newly checked out code, I need to set to the CWD. --- website/sandbox/learnpianochords/shell.nix | 3 ++- website/sandbox/learnpianochords/src/server/default.nix | 2 +- website/sandbox/learnpianochords/src/server/shell.nix | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'website') diff --git a/website/sandbox/learnpianochords/shell.nix b/website/sandbox/learnpianochords/shell.nix index 6cc05d099177..1a9c967f7fea 100644 --- a/website/sandbox/learnpianochords/shell.nix +++ b/website/sandbox/learnpianochords/shell.nix @@ -1,5 +1,6 @@ let - pkgs = import /home/wpcarro/nixpkgs {}; + briefcase = import {}; + pkgs = briefcase.third_party.pkgs; in pkgs.mkShell { buildInputs = with pkgs; [ elmPackages.elm diff --git a/website/sandbox/learnpianochords/src/server/default.nix b/website/sandbox/learnpianochords/src/server/default.nix index 6ed68d4417f4..87de69cbd627 100644 --- a/website/sandbox/learnpianochords/src/server/default.nix +++ b/website/sandbox/learnpianochords/src/server/default.nix @@ -1,5 +1,5 @@ let - briefcase = import /home/wpcarro/briefcase {}; + briefcase = import {}; in briefcase.buildHaskell.program { name = "server"; srcs = builtins.path { diff --git a/website/sandbox/learnpianochords/src/server/shell.nix b/website/sandbox/learnpianochords/src/server/shell.nix index a655c15871f9..ab470841e6c1 100644 --- a/website/sandbox/learnpianochords/src/server/shell.nix +++ b/website/sandbox/learnpianochords/src/server/shell.nix @@ -1,5 +1,5 @@ let - briefcase = import /home/wpcarro/briefcase {}; + briefcase = import {}; in briefcase.buildHaskell.shell { deps = hpkgs: with hpkgs; [ hspec -- cgit 1.4.1