From ef5caa6748fad30a87c68dd87c28667c71b317b9 Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 12 Apr 2023 10:49:45 +0800 Subject: [PATCH] deepin(go-package): use addToSearchPath to set GOPATH --- pkgs/desktops/deepin/go-package/dde-api/default.nix | 6 +++--- .../deepin/go-package/deepin-desktop-schemas/default.nix | 2 +- pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/deepin/go-package/dde-api/default.nix b/pkgs/desktops/deepin/go-package/dde-api/default.nix index ef4a287b3df9..3f38a599a25d 100644 --- a/pkgs/desktops/deepin/go-package/dde-api/default.nix +++ b/pkgs/desktops/deepin/go-package/dde-api/default.nix @@ -76,9 +76,9 @@ buildGoPackage rec { buildPhase = '' runHook preBuild - GOPATH="$GOPATH:${go-dbus-factory}/share/gocode" - GOPATH="$GOPATH:${go-gir-generator}/share/gocode" - GOPATH="$GOPATH:${go-lib}/share/gocode" + addToSearchPath GOPATH "${go-dbus-factory}/share/gocode" + addToSearchPath GOPATH "${go-gir-generator}/share/gocode" + addToSearchPath GOPATH "${go-lib}/share/gocode" make -C go/src/${goPackagePath} runHook postBuild ''; diff --git a/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix index 1fc24b4a283b..274c81bfce96 100644 --- a/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix +++ b/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix @@ -32,7 +32,7 @@ buildGoPackage rec { buildPhase = '' runHook preBuild - GOPATH="$GOPATH:${go-lib}/share/gocode" + addToSearchPath GOPATH "${go-lib}/share/gocode" make ARCH=${stdenv.targetPlatform.linuxArch} -C go/src/${goPackagePath} runHook postBuild ''; diff --git a/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix b/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix index 040c561d352e..99a0d8eb6c2a 100644 --- a/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix +++ b/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix @@ -59,9 +59,9 @@ buildGoPackage rec { buildPhase = '' runHook preBuild - GOPATH="$GOPATH:${go-dbus-factory}/share/gocode" - GOPATH="$GOPATH:${go-gir-generator}/share/gocode" - GOPATH="$GOPATH:${go-lib}/share/gocode" + addToSearchPath GOPATH "${go-dbus-factory}/share/gocode" + addToSearchPath GOPATH "${go-gir-generator}/share/gocode" + addToSearchPath GOPATH "${go-lib}/share/gocode" make -C go/src/${goPackagePath} runHook postBuild '';