Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Winapps
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
IMGW
Winapps
Commits
7f3cdcee
Commit
7f3cdcee
authored
9 months ago
by
Oskar Manhart
Browse files
Options
Downloads
Patches
Plain Diff
fix: fix malformed patch
parent
60b3e809
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
.pre-commit-config.yaml
+2
-0
2 additions, 0 deletions
.pre-commit-config.yaml
packages/winapps/default.nix
+2
-2
2 additions, 2 deletions
packages/winapps/default.nix
packages/winapps/setup.patch
+18
-16
18 additions, 16 deletions
packages/winapps/setup.patch
with
22 additions
and
18 deletions
.pre-commit-config.yaml
+
2
−
0
View file @
7f3cdcee
ci
:
autoupdate_branch
:
"
rewrite"
exclude
:
^(.+)\.patch$
repos
:
-
repo
:
https://github.com/Lucas-C/pre-commit-hooks
rev
:
v1.5.5
...
...
This diff is collapsed.
Click to expand it.
packages/winapps/default.nix
+
2
−
2
View file @
7f3cdcee
...
...
@@ -11,8 +11,8 @@
...
}:
let
rev
=
"
7bae17e3a3607e6b93c7cfc4155dfbdca7bba005
"
;
hash
=
"sha256-
PP4POMwHCsAdiCxZkjXlON84F0Mg3Pd5bHEI6tC+Sds
="
;
rev
=
"
07817afe0c2cad15c4eb90b5c94261a2b4d365d4
"
;
hash
=
"sha256-
4KxssnSw1Xk6huKRpbRFw6NXIhjCoZYBzu/HYA1ngDM
="
;
in
stdenv
.
mkDerivation
rec
{
pname
=
"winapps"
;
...
...
This diff is collapsed.
Click to expand it.
packages/winapps/setup.patch
+
18
−
16
View file @
7f3cdcee
...
...
@@ -4,8 +4,8 @@
readonly USER_BIN_PATH="${HOME}/.local/bin" # UNIX path to 'bin' directory for a '--user' WinApps installation.
readonly USER_BIN_PATH_WIN='\\tsclient\home\.local\bin' # WINDOWS path to 'bin' directory for a '--user' WinApps installation.
# 'SOURCE'
-readonly SYS_SOURCE_PATH="${SYS_BIN_PATH}/winapps" # UNIX path to WinApps source directory for a '--system' WinApps installation.
-readonly USER_SOURCE_PATH="${USER_BIN_PATH}/winapps" # UNIX path to WinApps source directory for a '--system' WinApps installation.
-readonly SYS_SOURCE_PATH="${SYS_BIN_PATH}/winapps
-src
" # UNIX path to WinApps source directory for a '--system' WinApps installation.
-readonly USER_SOURCE_PATH="${USER_BIN_PATH}/winapps
-src
" # UNIX path to WinApps source directory for a '--system' WinApps installation.
+readonly SYS_SOURCE_PATH="@out@/src" # UNIX path to WinApps source directory for a '--system' WinApps installation.
+readonly USER_SOURCE_PATH="@out@/src" # UNIX path to WinApps source directory for a '--system' WinApps installation.
# 'APP'
...
...
@@ -81,8 +81,10 @@
waFindInstalled
# Install the WinApps bash scripts.
- $SUDO ln -s "./bin/winapps" "${BIN_PATH}/winapps"
- $SUDO ln -s "./setup.sh" "${BIN_PATH}/winapps-setup"
- $SUDO ln -sf "${SOURCE_PATH}/bin/winapps" "${BIN_PATH}/winapps"
- $SUDO ln -sf "${SOURCE_PATH}/setup.sh" "${BIN_PATH}/winapps-setup"
+
+
# Configure the Windows RDP session application launcher.
waConfigureWindows
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment