Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Package WinApps (and the Launcher) with Nix #234

Merged
merged 22 commits into from
Nov 1, 2024
Merged

Package WinApps (and the Launcher) with Nix #234

Changes from 2 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
da35923
feat: package winapps & the winapps launcher using nix
oskardotglobal Aug 30, 2024
00141f1
fix: do not symlink binaries on nix
oskardotglobal Sep 7, 2024
26a2f13
feat: bump version
oskardotglobal Sep 7, 2024
b7b5b34
Merge branch 'main' into feat-nix-packaging
oskardotglobal Sep 8, 2024
f4c0a45
fix: properly escape ${}
oskardotglobal Sep 8, 2024
b0f2830
feat: bump version
oskardotglobal Sep 8, 2024
7d5cce3
feat: use nixfmt
oskardotglobal Sep 9, 2024
28e958e
feat: use patches
oskardotglobal Sep 9, 2024
b044cb4
fix: properly name patches & remove nixfmt pre-commit hook since it r…
oskardotglobal Sep 9, 2024
60b3e80
Merge remote-tracking branch 'origin/main' into feat-nix-packaging
oskardotglobal Sep 9, 2024
7f3cdce
fix: fix malformed patch
oskardotglobal Sep 9, 2024
509a782
Merge branch 'main' into feat-nix-packaging
oskardotglobal Sep 14, 2024
64478a8
use netcat instead of netcat-gnu
CHN-beta Oct 5, 2024
d248abc
Merge pull request #281 from CHN-beta/feat-nix-packaging
oskardotglobal Oct 5, 2024
e8dc55a
fix: typo
oskardotglobal Oct 5, 2024
9d455ba
feat: flake-compat
oskardotglobal Oct 22, 2024
e8fbc95
Merge branch 'feat-nix-packaging' of github.com:winapps-org/winapps i…
oskardotglobal Oct 22, 2024
e630b5a
feat: update packages
oskardotglobal Oct 22, 2024
7277f71
feat: auto-update flake weekly
oskardotglobal Oct 22, 2024
df54d08
feat: properly set versions
oskardotglobal Oct 22, 2024
2dafe2d
fix: iron out some more issues
oskardotglobal Oct 30, 2024
b18efc4
fix: don't change mode for owner but for current user
oskardotglobal Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions packages/winapps/default.nix
View file
Open in desktop
oskardotglobal marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
iproute2,
...
}: let
rev = "4e3d5bd4581250a49974a19b37f55fc76165051a";
hash = "sha256-meM9U6MLVqN0SjzorL8TeYKEkFXykCJI7BTady5CWMA=";
rev = "350f003d817765ed9e6f4791e86c3d69019f230a";
hash = "sha256-MqQ9KFyo6bZDxfWCe62z1zDSvHJJjvWqZLO4UxwELow=";
in
stdenv.mkDerivation rec {
pname = "winapps";
Expand Down Expand Up @@ -42,8 +42,6 @@ in

sed -E -i \
oskardotglobal marked this conversation as resolved.
Show resolved Hide resolved
-e 's/grep -q -E "\\blibvirt\\b"/grep -q -E "\\blibvirtd\\b"/' \
-e 's|\$SUDO ln -s "./bin/winapps"(.*)||' \
-e 's|\$SUDO ln -s "./setup.sh"(.*)||' \
$out/bin/winapps

sed -E -i \
Expand All @@ -53,6 +51,9 @@ in
-e "$(printf "%s$out%s" 's|^readonly USER_SOURCE_PATH="(.*?)"|readonly USER_SOURCE_PATH="' '/src"|')" \
-e 's/\$SUDO git -C "\$SOURCE_PATH" pull --no-rebase//g' \
-e 's|./setup.sh|winapps-setup|g' \
-e 's|\$SUDO ln -s "./bin/winapps" "\$\{BIN_PATH\}/winapps"||' \
-e 's|\$SUDO ln -s "./setup.sh" "\$\{BIN_PATH\}/winapps-setup"||' \
-e "s|\$\{BIN_PATH\}/winapps|$out/bin/winapps|" \
$out/bin/winapps-setup

for f in winapps-setup winapps; do
Expand Down