summary refs log tree commit diff
diff options
context:
space:
mode:
authorEd Cragg <drq.11235@gmail.com>2020-05-01 11:43:56 +0100
committerEd Cragg <drq.11235@gmail.com>2020-05-01 14:46:46 +0100
commitdf2f8d915051d3d494ba7cb572c66c84bef84dcf (patch)
treed3aa1d65f8e2f8cfc0e04ca55179caaaba48c7bf
parent43a4f128bd9b4ded3919c0ebd8c9aeb2ce5f3988 (diff)
downloadnixpkgs-df2f8d915051d3d494ba7cb572c66c84bef84dcf.tar
nixpkgs-df2f8d915051d3d494ba7cb572c66c84bef84dcf.tar.gz
nixpkgs-df2f8d915051d3d494ba7cb572c66c84bef84dcf.tar.bz2
nixpkgs-df2f8d915051d3d494ba7cb572c66c84bef84dcf.tar.lz
nixpkgs-df2f8d915051d3d494ba7cb572c66c84bef84dcf.tar.xz
nixpkgs-df2f8d915051d3d494ba7cb572c66c84bef84dcf.tar.zst
nixpkgs-df2f8d915051d3d494ba7cb572c66c84bef84dcf.zip
thelounge: write out default path for thelounge
The output file is found and handled by thelounge itself [1], leaving
the user free to override THELOUNGE_HOME in the environment if they
choose, but having a sensible default to make `thelounge` generally
usable in most cases.

This solution follows discussion on #70318.

[1] https://github.com/thelounge/thelounge/blob/9ef5c6c67e463c1f401e33b21dfb5641636e5ed1/src/command-line/utils.js#L56
-rw-r--r--nixos/modules/services/networking/thelounge.nix1
-rw-r--r--pkgs/development/node-packages/default-v10.nix3
2 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/services/networking/thelounge.nix b/nixos/modules/services/networking/thelounge.nix
index 875d8f66169..a1b06703484 100644
--- a/nixos/modules/services/networking/thelounge.nix
+++ b/nixos/modules/services/networking/thelounge.nix
@@ -62,7 +62,6 @@ in {
     systemd.services.thelounge = {
       description = "The Lounge web IRC client";
       wantedBy = [ "multi-user.target" ];
-      environment = { THELOUNGE_HOME = dataDir; };
       preStart = "ln -sf ${pkgs.writeText "config.js" configJsData} ${dataDir}/config.js";
       serviceConfig = {
         User = "thelounge";
diff --git a/pkgs/development/node-packages/default-v10.nix b/pkgs/development/node-packages/default-v10.nix
index 5d7e2c7668f..9e9d8894f0d 100644
--- a/pkgs/development/node-packages/default-v10.nix
+++ b/pkgs/development/node-packages/default-v10.nix
@@ -125,5 +125,8 @@ nodePackages // {
 
   thelounge = nodePackages.thelounge.override {
     buildInputs = [ nodePackages.node-pre-gyp ];
+    postInstall = ''
+      echo /var/lib/thelounge > $out/lib/node_modules/thelounge/.thelounge_home
+    '';
   };
 }