gclient2nix: do not depend on nixpkgs path (#396741)

This commit is contained in:
K900 2025-04-07 09:44:06 +03:00 committed by GitHub
commit 16af6f882a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 1 additions and 3 deletions

View File

@ -23,7 +23,7 @@ import gclient_utils
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
click_log.basic_config(logger) click_log.basic_config(logger)
nixpkgs_path = "@nixpkgs_path@" nixpkgs_path = "<nixpkgs>"
memory: Memory = Memory(user_cache_dir("gclient2nix"), verbose=0) memory: Memory = Memory(user_cache_dir("gclient2nix"), verbose=0)

View File

@ -3,7 +3,6 @@
python3, python3,
runCommand, runCommand,
makeWrapper, makeWrapper,
path,
fetchgit, fetchgit,
nurl, nurl,
writers, writers,
@ -66,7 +65,6 @@ runCommand "gclient2nix"
buildInputs = [ python ]; buildInputs = [ python ];
# substitutions # substitutions
nixpkgs_path = if builtins.pathExists (path + "/.git") then lib.cleanSource path else path;
depot_tools_checkout = fetchgit { depot_tools_checkout = fetchgit {
url = "https://chromium.googlesource.com/chromium/tools/depot_tools"; url = "https://chromium.googlesource.com/chromium/tools/depot_tools";
rev = "452fe3be37f78fbecefa1b4b0d359531bcd70d0d"; rev = "452fe3be37f78fbecefa1b4b0d359531bcd70d0d";