646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
22 lines
706 B
Diff
22 lines
706 B
Diff
diff -Naur source-old/src/main.cpp source-new/src/main.cpp
|
|
--- source-old/src/main.cpp 1969-12-31 21:00:01.000000000 -0300
|
|
+++ source-new/src/main.cpp 2022-10-23 22:30:00.463905363 -0300
|
|
@@ -286,13 +286,10 @@
|
|
// Platform specific settings
|
|
vymPlatform = QSysInfo::prettyProductName();
|
|
|
|
-#if defined(Q_OS_WINDOWS)
|
|
- // Only Windows 10 has tar. Older windows versions not supported.
|
|
- zipToolPath = "tar";
|
|
-#else
|
|
- zipToolPath = "/usr/bin/zip";
|
|
- unzipToolPath = "/usr/bin/unzip";
|
|
-#endif
|
|
+ // Nixpkgs-specific hack
|
|
+ zipToolPath = "@zipPath@";
|
|
+ unzipToolPath = "@unzipPath@";
|
|
+
|
|
iconPath = vymBaseDir.path() + "/icons/";
|
|
flagsPath = vymBaseDir.path() + "/flags/";
|
|
|