From c6e2cc9b6c02249e78845e9fa18b241f8c6667ec Mon Sep 17 00:00:00 2001 From: Yureka Date: Mon, 7 Apr 2025 08:32:53 +0200 Subject: [PATCH] gclient2nix: do not depend on nixpkgs path --- pkgs/by-name/gc/gclient2nix/gclient2nix.py | 2 +- pkgs/by-name/gc/gclient2nix/package.nix | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/by-name/gc/gclient2nix/gclient2nix.py b/pkgs/by-name/gc/gclient2nix/gclient2nix.py index 8535593f0d18..62437086a849 100755 --- a/pkgs/by-name/gc/gclient2nix/gclient2nix.py +++ b/pkgs/by-name/gc/gclient2nix/gclient2nix.py @@ -23,7 +23,7 @@ import gclient_utils logger = logging.getLogger(__name__) click_log.basic_config(logger) -nixpkgs_path = "@nixpkgs_path@" +nixpkgs_path = "" memory: Memory = Memory(user_cache_dir("gclient2nix"), verbose=0) diff --git a/pkgs/by-name/gc/gclient2nix/package.nix b/pkgs/by-name/gc/gclient2nix/package.nix index ee7251b9ffa7..7d55d0e234a8 100644 --- a/pkgs/by-name/gc/gclient2nix/package.nix +++ b/pkgs/by-name/gc/gclient2nix/package.nix @@ -3,7 +3,6 @@ python3, runCommand, makeWrapper, - path, fetchgit, nurl, writers, @@ -66,7 +65,6 @@ runCommand "gclient2nix" buildInputs = [ python ]; # substitutions - nixpkgs_path = if builtins.pathExists (path + "/.git") then lib.cleanSource path else path; depot_tools_checkout = fetchgit { url = "https://chromium.googlesource.com/chromium/tools/depot_tools"; rev = "452fe3be37f78fbecefa1b4b0d359531bcd70d0d";