Merge pull request #268619 from tweag/lib-descriptions
[NixPkgs.git] / pkgs / applications / misc / vym / 000-fix-zip-paths.diff
blob37512aded12fa53aa76d142da79a6ca2aa549086
1 diff -Naur source-old/src/main.cpp source-new/src/main.cpp
2 --- source-old/src/main.cpp 1969-12-31 21:00:01.000000000 -0300
3 +++ source-new/src/main.cpp 2022-10-23 22:30:00.463905363 -0300
4 @@ -286,13 +286,10 @@
5 // Platform specific settings
6 vymPlatform = QSysInfo::prettyProductName();
8 -#if defined(Q_OS_WINDOWS)
9 - // Only Windows 10 has tar. Older windows versions not supported.
10 - zipToolPath = "tar";
11 -#else
12 - zipToolPath = "/usr/bin/zip";
13 - unzipToolPath = "/usr/bin/unzip";
14 -#endif
15 + // Nixpkgs-specific hack
16 + zipToolPath = "@zipPath@";
17 + unzipToolPath = "@unzipPath@";
19 iconPath = vymBaseDir.path() + "/icons/";
20 flagsPath = vymBaseDir.path() + "/flags/";