diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-03-08 00:10:21 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-08 00:10:21 +0100 |
commit | e4eb5b5fcc33d6a584bb3542b0dcb1c7abe21f79 (patch) | |
tree | 7a585cf61492493591f968489c6b2a90ff77ec2e /pkgs/tools/system | |
parent | 473d080eb900671b84adc597457f5e760ab6afd2 (diff) | |
parent | 70330b7e69978310f569a9a4cfc2351cfbc48e57 (diff) |
Merge pull request #293741 from eclairevoyant/wslu
wslu: install desktop item; move to by-name
Diffstat (limited to 'pkgs/tools/system')
-rw-r--r-- | pkgs/tools/system/wslu/default.nix | 39 | ||||
-rw-r--r-- | pkgs/tools/system/wslu/fallback-conf-nix-store.diff | 22 |
2 files changed, 0 insertions, 61 deletions
diff --git a/pkgs/tools/system/wslu/default.nix b/pkgs/tools/system/wslu/default.nix deleted file mode 100644 index 6337e479bb31e..0000000000000 --- a/pkgs/tools/system/wslu/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -}: - -stdenv.mkDerivation rec { - pname = "wslu"; - version = "4.1.1"; - - src = fetchFromGitHub { - owner = "wslutilities"; - repo = pname; - rev = "v${version}"; - hash = "sha256-yhugh836BoSISbTu19ubLOrz5X31Opu5QtCR0DXrbWc="; - }; - - patches = [ - ./fallback-conf-nix-store.diff - ]; - - postPatch = '' - substituteInPlace src/wslu-header \ - --subst-var out - ''; - - makeFlags = [ - "DESTDIR=$(out)" - "PREFIX=" - ]; - - meta = with lib; { - description = "A collection of utilities for Windows Subsystem for Linux"; - homepage = "https://github.com/wslutilities/wslu"; - changelog = "https://github.com/wslutilities/wslu/releases/tag/v${version}"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ jamiemagee ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/system/wslu/fallback-conf-nix-store.diff b/pkgs/tools/system/wslu/fallback-conf-nix-store.diff deleted file mode 100644 index 6315e78d7de4e..0000000000000 --- a/pkgs/tools/system/wslu/fallback-conf-nix-store.diff +++ /dev/null @@ -1,22 +0,0 @@ -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 { |