Unverified Commit 16af6f88 authored by K900's avatar K900 Committed by GitHub
Browse files

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

parents f5ac72aa c6e2cc9b

pkgs/by-name/gc/gclient2nix/gclient2nix.py

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import gclient_utils 
logger = logging.getLogger(__name__)

click_log.basic_config(logger)



nixpkgs_path = "@nixpkgs_path@"

nixpkgs_path = "<nixpkgs>"



memory: Memory = Memory(user_cache_dir("gclient2nix"), verbose=0)

pkgs/by-name/gc/gclient2nix/package.nix

+0 −2
Original line number Diff line number Diff line
@@ -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";