llonebot.nix/pmhq.patch at main · LLOneBot/llonebot.nix · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
diff --git a/package/qq/package.nix b/package/qq/package.nix
index 85acf56..55430e0 100644
--- a/package/qq/package.nix
+++ b/package/qq/package.nix
@@ -26,7 +26,7 @@
   autoPatchelfHook,
   writeShellScript,
   makeShellWrapper,
-  wrapGAppsHook3,
+  wrapGAppsHook4,
   commandLineArgs ? "",
   disableAutoUpdate ? true,
 }:
@@ -51,7 +51,7 @@ let
       "x86_64-darwin"
       "x86_64-linux"
     ];
-    license = lib.licenses.unfree;
+    # license = lib.licenses.unfree;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     maintainers = with lib.maintainers; [
       bot-wxt1221
@@ -96,7 +96,7 @@ else
     nativeBuildInputs = [
       autoPatchelfHook
       makeShellWrapper
-      wrapGAppsHook3
+      wrapGAppsHook4
       dpkg
     ];

@@ -182,9 +182,9 @@ else
         cp -r opt $out/opt
         cp -r usr/share $out/share
         substituteInPlace $out/share/applications/qq.desktop \
-          --replace-fail "/opt/QQ/qq" "$out/bin/qq" \
+          --replace-fail "/opt/QQ/qq" "$out/opt/QQ/qq" \
           --replace-fail "/usr/share" "$out/share"
-        makeShellWrapper $out/opt/QQ/qq $out/bin/qq \
+        makeShellWrapper $out/opt/QQ/qq $out/opt/QQ/qq-wrapper \
           --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
           --prefix LD_PRELOAD : "${lib.makeLibraryPath [ libssh2 ]}/libssh2.so.1" \
           --prefix LD_LIBRARY_PATH : "${
diff --git a/pmhq.patch b/pmhq.patch
index fd02314..e69de29 100644
--- a/pmhq.patch
+++ b/pmhq.patch
@@ -1,43 +0,0 @@
-diff --git a/package/qq/package.nix b/package/qq/package.nix
-index f5933b5..d217a4e 100644
---- a/package/qq/package.nix
-+++ b/package/qq/package.nix
-@@ -25,7 +25,7 @@
-   at-spi2-core,
-   autoPatchelfHook,
-   makeShellWrapper,
--  wrapGAppsHook3,
-+  wrapGAppsHook4,
-   commandLineArgs ? "",
- }:
-
-@@ -48,7 +48,7 @@ let
-       "x86_64-darwin"
-       "x86_64-linux"
-     ];
--    license = lib.licenses.unfree;
-+    # license = lib.licenses.unfree;
-     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-     maintainers = with lib.maintainers; [
-       bot-wxt1221
-@@ -93,7 +93,7 @@ else
-     nativeBuildInputs = [
-       autoPatchelfHook
-       makeShellWrapper
--      wrapGAppsHook3
-+      wrapGAppsHook4
-       dpkg
-     ];
-
-@@ -127,9 +127,9 @@ else
-       cp -r opt $out/opt
-       cp -r usr/share $out/share
-       substituteInPlace $out/share/applications/qq.desktop \
--        --replace-fail "/opt/QQ/qq" "$out/bin/qq" \
-+        --replace-fail "/opt/QQ/qq" "$out/opt/QQ/qq" \
-         --replace-fail "/usr/share" "$out/share"
--      makeShellWrapper $out/opt/QQ/qq $out/bin/qq \
-+      makeShellWrapper $out/opt/QQ/qq $out/opt/QQ/qq-wrapper \
-         --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
-         --prefix LD_PRELOAD : "${lib.makeLibraryPath [ libssh2 ]}/libssh2.so.1" \
-         --prefix LD_LIBRARY_PATH : "${