cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

aerc: replace an extra use of SHAREDIR

Browse source
This commit is contained in:
Charlotte Van Petegem 2021-01-20 16:30:03 +01:00
parent c4ba6fc358
commit d76bdf6489
No known key found for this signature in database
GPG key ID: 019E764B7184435A
1 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch
View file

@ -1,6 +1,6 @@
From 6cf3c2e42d219b9665a43ca65f321c653b0aa102 Mon Sep 17 00:00:00 2001 From c715a96c693baa0e6c8ab3c96b6c10e0a40bf7af Mon Sep 17 00:00:00 2001
From: Tadeo Kondrak <me@tadeo.ca> From: Tadeo Kondrak <me@tadeo.ca>
Date: Mon, 28 Oct 2019 08:36:36 -0600 Date: Thu, 21 Jan 2021 10:40:49 +0100
Subject: [PATCH] Fix aerc breaking every time the package is rebuilt. Subject: [PATCH] Fix aerc breaking every time the package is rebuilt.
On NixOS, the SHAREDIR changes on every rebuild to the package, but aerc On NixOS, the SHAREDIR changes on every rebuild to the package, but aerc
@ -8,28 +8,28 @@ fills it in as part of the default config and then installs that config
to the users home folder. Fix this by not substituting @SHAREDIR@ in the to the users home folder. Fix this by not substituting @SHAREDIR@ in the
default config until runtime. default config until runtime.
--- ---
Makefile | 2 +- Makefile | 2 +-
config/config.go | 8 ++++++++ config/config.go | 13 +++++++++++++
2 files changed, 9 insertions(+), 1 deletion(-) 2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index d1c755d..1185a96 100644 index 77f5e61..98cbc11 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -24,7 +24,7 @@ aerc: $(GOSRC) @@ -23,7 +23,7 @@ aerc: $(GOSRC)
-o $@ -o $@
aerc.conf: config/aerc.conf.in aerc.conf: config/aerc.conf.in
- sed -e 's:@SHAREDIR@:$(SHAREDIR):g' > $@ < config/aerc.conf.in - sed -e 's:@SHAREDIR@:$(SHAREDIR):g' > $@ < config/aerc.conf.in
+ cat config/aerc.conf.in > $@ + cat config/aerc.conf.in > $@
DOCS := \ debug: $(GOSRC)
aerc.1 \ GOFLAGS="-tags=notmuch" \
diff --git a/config/config.go b/config/config.go diff --git a/config/config.go b/config/config.go
index 32d07fc..8ffd3e8 100644 index 87d183a..cb6611a 100644
--- a/config/config.go --- a/config/config.go
+++ b/config/config.go +++ b/config/config.go
@@ -472,6 +472,11 @@ func LoadConfigFromFile(root *string, sharedir string) (*AercConfig, error) { @@ -470,6 +470,16 @@ func LoadConfigFromFile(root *string, sharedir string) (*AercConfig, error) {
return nil, err return nil, err
} }
} }
@ -37,12 +37,16 @@ index 32d07fc..8ffd3e8 100644
+ if key, err := sec.GetKey("template-dirs"); err == nil { + if key, err := sec.GetKey("template-dirs"); err == nil {
+ sec.NewKey("template-dirs", strings.ReplaceAll(key.String(), "@SHAREDIR@", sharedir)) + sec.NewKey("template-dirs", strings.ReplaceAll(key.String(), "@SHAREDIR@", sharedir))
+ } + }
+ }
+ if sec, err := file.GetSection("ui"); err == nil {
+ if key, err := sec.GetKey("stylesets-dirs"); err == nil {
+ sec.NewKey("stylesets-dirs", strings.ReplaceAll(key.String(), "@SHAREDIR@", sharedir))
+ }
+ } + }
file.NameMapper = mapName file.NameMapper = mapName
config := &AercConfig{ config := &AercConfig{
Bindings: BindingConfig{ Bindings: BindingConfig{
@@ -546,6 +428,9 @@ func LoadConfigFromFile(root *string, sharedir string) (*AercConfig, error) { @@ -547,6 +557,9 @@ func LoadConfigFromFile(root *string, sharedir string) (*AercConfig, error) {
if err = config.LoadConfig(file); err != nil {
return nil, err return nil, err
} }
@ -53,5 +57,4 @@ index 32d07fc..8ffd3e8 100644
if err := ui.MapTo(&config.General); err != nil { if err := ui.MapTo(&config.General); err != nil {
return nil, err return nil, err
-- --
2.23.0 2.30.0