From 48cc610fa4681e4a423f47c5a9a19bf8ebe05821 Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Sun, 28 Jun 2020 20:33:25 -0400 Subject: fix(xan): Build without nixpkgs in NIX_PATH CI doesn't have a nixpkgs channel (obvs), and we want to be able to build from the depot tree, so reorder some stuff so we never depend on nixpkgs Change-Id: I99b513a3d7bcd64b6d167335856651e0ca66e33b Reviewed-on: https://cl.tvl.fyi/c/depot/+/734 --- users/glittershark/xanthous/pkg.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'users/glittershark/xanthous/pkg.nix') diff --git a/users/glittershark/xanthous/pkg.nix b/users/glittershark/xanthous/pkg.nix index dcf508fa54..91de68ea32 100644 --- a/users/glittershark/xanthous/pkg.nix +++ b/users/glittershark/xanthous/pkg.nix @@ -1,9 +1,6 @@ -{ nixpkgs ? import ./nixpkgs.nix {} -, -}: +{ pkgs ? import ./nixpkgs.nix {} }: let inherit (builtins) filterSource elem not; - inherit (nixpkgs) pkgs; gitignoreSource = (import (pkgs.fetchFromGitHub { owner = "hercules-ci"; repo = "gitignore"; -- cgit 1.4.1