From 161c4dd2ae61f97f0006bdba53abcc3284dda25e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 20 Jan 2023 13:02:03 +0100 Subject: [PATCH] wslu: supply default conf This fixes running `wslvar USERNAME` after one of the recent update. --- pkgs/tools/system/wslu/default.nix | 9 ++++++++ .../system/wslu/fallback-conf-nix-store.diff | 22 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/system/wslu/fallback-conf-nix-store.diff diff --git a/pkgs/tools/system/wslu/default.nix b/pkgs/tools/system/wslu/default.nix index f765da194c0..6337e479bb3 100644 --- a/pkgs/tools/system/wslu/default.nix +++ b/pkgs/tools/system/wslu/default.nix @@ -14,6 +14,15 @@ stdenv.mkDerivation rec { hash = "sha256-yhugh836BoSISbTu19ubLOrz5X31Opu5QtCR0DXrbWc="; }; + patches = [ + ./fallback-conf-nix-store.diff + ]; + + postPatch = '' + substituteInPlace src/wslu-header \ + --subst-var out + ''; + makeFlags = [ "DESTDIR=$(out)" "PREFIX=" diff --git a/pkgs/tools/system/wslu/fallback-conf-nix-store.diff b/pkgs/tools/system/wslu/fallback-conf-nix-store.diff new file mode 100644 index 00000000000..6315e78d7de --- /dev/null +++ b/pkgs/tools/system/wslu/fallback-conf-nix-store.diff @@ -0,0 +1,22 @@ +diff --git a/src/wslu-header b/src/wslu-header +index 5f33925..159c6af 100644 +--- a/src/wslu-header ++++ b/src/wslu-header +@@ -169,11 +169,17 @@ if [ -f "$HOME/.config/wslu/conf" ]; then + debug_echo "$HOME/.config/wslu/conf found, sourcing" + source "$HOME/.config/wslu/conf" + fi ++ + if [ -f "$HOME/.wslurc" ]; then + debug_echo "$HOME/.wslurc found, sourcing" + source "$HOME/.wslurc" + fi + ++if [ -f "@out@/share/wslu/conf" ]; then ++ debug_echo "@out@/share/wslu/conf found, sourcing" ++ source "@out@/share/wslu/conf" ++fi ++ + # functions + + function help {