From 76034fee72c735a6419477f9e968284fa44e6b1e Mon Sep 17 00:00:00 2001 From: Diogo Xavier Date: Sat, 8 Jan 2022 15:14:14 +0000 Subject: [PATCH 1/2] jetbrains.goland: Fix debugging --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 2b03b5e94b3a..a957561faa88 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -93,8 +93,8 @@ let chmod +x $out/goland*/plugins/go/lib/dlv/linux/dlv # fortify source breaks build since delve compiles with -O0 - wrapProgram $out/goland*/plugins/go/lib/dlv/linux/dlv \ - --prefix disableHardening " " fortify + wrapProgram $out/bin/goland \ + --set CGO_CPPFLAGS "-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0" ''; }); From 4cb152fceaf8d3a93227b6965325fc81a689951c Mon Sep 17 00:00:00 2001 From: diogox Date: Sun, 9 Jan 2022 17:35:01 +0000 Subject: [PATCH 2/2] Update pkgs/applications/editors/jetbrains/default.nix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jörg Thalheim --- pkgs/applications/editors/jetbrains/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index a957561faa88..4922322f5589 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -94,7 +94,7 @@ let # fortify source breaks build since delve compiles with -O0 wrapProgram $out/bin/goland \ - --set CGO_CPPFLAGS "-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0" + --prefix CGO_CPPFLAGS " " "-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0" ''; });