From 41c2fb3f25c31fa07ca990b35b5a0fa1980652a8 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Mon, 2 Oct 2017 23:15:13 +0200 Subject: [PATCH] gogs: patch gogs to include default STATIC_ROOT_PATH --- .../version-management/gogs/default.nix | 7 +++++-- .../version-management/gogs/static-root-path.patch | 13 +++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/version-management/gogs/static-root-path.patch diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index 5553a759894..1522f348ca1 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -16,9 +16,12 @@ buildGoPackage rec { sha256 = "1xn1b4dxf7r8kagps3yvp31zskfxn50k1gfic9abl4kjwpwk78c0"; }; - patchPhase = '' + patches = [ ./static-root-path.patch ]; + + postPatch = '' patchShebangs . - ''; + substituteInPlace pkg/setting/setting.go --subst-var data + ''; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/gogs/static-root-path.patch b/pkgs/applications/version-management/gogs/static-root-path.patch new file mode 100644 index 00000000000..9eaa72a0c85 --- /dev/null +++ b/pkgs/applications/version-management/gogs/static-root-path.patch @@ -0,0 +1,13 @@ +diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go +index f206592d..796da6ef 100644 +--- a/pkg/setting/setting.go ++++ b/pkg/setting/setting.go +@@ -474,7 +474,7 @@ func NewContext() { + LocalURL = sec.Key("LOCAL_ROOT_URL").MustString(string(Protocol) + "://localhost:" + HTTPPort + "/") + OfflineMode = sec.Key("OFFLINE_MODE").MustBool() + DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool() +- StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(workDir) ++ StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString("@data@") + AppDataPath = sec.Key("APP_DATA_PATH").MustString("data") + EnableGzip = sec.Key("ENABLE_GZIP").MustBool() +