From 787af0f79f128cb21b113d2eb37e64d913f18aae Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 5 Jul 2023 18:10:09 +0300 Subject: [PATCH] kitty: make possible to override goModules go-modules name had to be changed to goModules so it becomes a env var (bash vars can't contain -) enables overriding the build without overriding configurePhase ``` pkgs.kitty.overrideAttrs (finalAttrs: previousAttrs: { name = "kitty-master"; version = "master"; src = pkgs.fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "66a2efd191f98a1a5b3c2d4fdc9569204b445a2f"; sha256 = "sha256-pJuhnJOjGBflHXOOYKrg9/e3c+VGEESZtfka84ARCd4="; }; goModules = (pkgs.buildGoModule { pname = "kitty-go-modules"; inherit (finalAttrs) src version; vendorHash = "sha256-eAovZ/7JnvXlnlFyt0skhYJ1Nrzy2XCpRlQvSmWCyaY="; }).go-modules; }) ``` --- pkgs/applications/terminal-emulators/kitty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index e693e51c9360..ea7fc0e3e71e 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -100,7 +100,7 @@ buildPythonApplication rec { CGO_ENABLED = 0; GOFLAGS = "-trimpath"; - go-modules = (buildGoModule { + goModules = (buildGoModule { pname = "kitty-go-modules"; inherit src vendorHash version; }).go-modules; @@ -109,7 +109,7 @@ buildPythonApplication rec { export GOCACHE=$TMPDIR/go-cache export GOPATH="$TMPDIR/go" export GOPROXY=off - cp -r --reflink=auto ${go-modules} vendor + cp -r --reflink=auto $goModules vendor ''; buildPhase = let