ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-10 16:45:51 +03:00
Code Issues Projects Releases Wiki Activity

wslu: supply default conf

Browse Source 
This fixes running `wslvar USERNAME` after one of the recent update.
This commit is contained in:
Sandro Jäckel 2023-01-20 13:02:03 +01:00
parent 0b0bb22e97
commit 161c4dd2ae
No known key found for this signature in database
GPG Key ID: B1763F8651144063
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/tools/system/wslu/default.nix
View File

@ -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="

22
pkgs/tools/system/wslu/fallback-conf-nix-store.diff Normal file
View File

@ -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 {