Skip to content
This repository has been archived by the owner on Oct 29, 2024. It is now read-only.

Commit

Permalink
TEST
Browse files Browse the repository at this point in the history
  • Loading branch information
@DataEraserC
DataEraserC committed Oct 6, 2023
1 parent 1b58cc3 commit cd68e34
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions pkgs/wechat_dev_tools_appimage/wechat_dev_tools_appimage.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/{bin,lib/wechat_dev_tools}
ln -s $src $out/lib/wechat_dev_tools/wechat_dev_tools.AppImage
install -Dm644 $icon $out/share/icons/hicolor/48x48/apps/wechat_dev_tools.png
makeWrapper ${appimage-run}/bin/appimage-run $out/bin/wechat_dev_tools \
makeWrapper ${appimage-run}/bin/appimage-run $out/bin/wechat_dev_tools-appimage \
--argv0 "wechat_dev_tools" \
--add-flags "$out/lib/wechat_dev_tools/wechat_dev_tools.AppImage"
}
Expand All @@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
desktopItems = lib.toList (makeDesktopItem {
name = "Wechat Dev Tools";
genericName = "The development tools for wechat projects";
exec = "wechat_dev_tools";
exec = "wechat_dev_tools-appimage";
icon = "wechat_dev_tools";
comment = "The development tools for wechat projects";
mimeTypes = [ "x-scheme-handler/wechatide" ];
Expand Down
8 changes: 4 additions & 4 deletions pkgs/wechat_dev_tools_deb/wechat_dev_tools_deb.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ stdenv.mkDerivation rec {

installPhase = ''
_package-ide() {
mkdir -p $out/{bin,share/wechat_devtools,lib}
mkdir -p $out/{bin,share/io.github.msojocs.wechat-devtools-linux,lib}
mv opt/apps/io.github.msojocs.wechat-devtools-linux $out/share/wechat_devtools
mv opt/apps/io.github.msojocs.wechat-devtools-linux $out/share/io.github.msojocs.wechat-devtools-linux
mv usr/share/* $out/share/
substituteInPlace $out/share/applications/io.github.msojocs.wechat-devtools-linux.desktop \
--replace "/opt/apps/io.github.msojocs.wechat-devtools-linux/files/bin/bin/wechat-devtools" "$out/bin/wechat-devtools"
--replace "/opt/apps/io.github.msojocs.wechat-devtools-linux/files/bin/bin/wechat-devtools" "$out/bin/wechat_dev_tools-deb"
}
_package-ide
'';
Expand All @@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
runtimeLibs = pkgs.lib.makeLibraryPath libraries;

preFixup = ''
makeWrapper $out/share/wechat_devtools/io.github.msojocs.wechat-devtools-linux/files/bin/bin/wechat-devtools $out/bin/wechat-devtools \
makeWrapper $out/share/io.github.msojocs.wechat-devtools-linux/io.github.msojocs.wechat-devtools-linux/files/bin/bin/wechat-devtools $out/bin/wechat_dev_tools-deb \
--prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
"''${gappsWrapperArgs[@]}"
'';
Expand Down
4 changes: 2 additions & 2 deletions pkgs/wechat_dev_tools_fhs_appimage/wechat_dev_tools_appimage.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/{bin,lib/wechat_dev_tools}
ln -s $src $out/lib/wechat_dev_tools/wechat_dev_tools.AppImage
install -Dm644 $icon $out/share/icons/hicolor/48x48/apps/wechat_dev_tools.png
makeWrapper ${appimage-run}/bin/appimage-run $out/bin/wechat_dev_tools \
makeWrapper ${appimage-run}/bin/appimage-run $out/bin/wechat_dev_tools-appimage \
--argv0 "wechat_dev_tools" \
--add-flags "$out/lib/wechat_dev_tools/wechat_dev_tools.AppImage"
}
Expand All @@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
desktopItems = lib.toList (makeDesktopItem {
name = "Wechat Dev Tools";
genericName = "The development tools for wechat projects";
exec = "wechat_dev_tools";
exec = "wechat_dev_tools-appimage";
icon = "wechat_dev_tools";
comment = "The development tools for wechat projects";
mimeTypes = [ "x-scheme-handler/wechatide" ];
Expand Down
8 changes: 4 additions & 4 deletions pkgs/wechat_dev_tools_fhs_deb/wechat_dev_tools_deb.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ stdenv.mkDerivation rec {

installPhase = ''
_package-ide() {
mkdir -p $out/{bin,share/wechat_devtools,lib}
mkdir -p $out/{bin,share/io.github.msojocs.wechat-devtools-linux,lib}
mv opt/apps/io.github.msojocs.wechat-devtools-linux $out/share/wechat_devtools
mv opt/apps/io.github.msojocs.wechat-devtools-linux $out/share/io.github.msojocs.wechat-devtools-linux
mv usr/share/* $out/share/
substituteInPlace $out/share/applications/io.github.msojocs.wechat-devtools-linux.desktop \
--replace "/opt/apps/io.github.msojocs.wechat-devtools-linux/files/bin/bin/wechat-devtools" "$out/bin/wechat-devtools"
--replace "/opt/apps/io.github.msojocs.wechat-devtools-linux/files/bin/bin/wechat-devtools" "$out/bin/wechat_dev_tools-deb"
}
_package-ide
'';
Expand All @@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
runtimeLibs = pkgs.lib.makeLibraryPath libraries;

preFixup = ''
makeWrapper $out/share/wechat_devtools/io.github.msojocs.wechat-devtools-linux/files/bin/bin/wechat-devtools $out/bin/wechat-devtools \
makeWrapper $out/share/io.github.msojocs.wechat-devtools-linux/io.github.msojocs.wechat-devtools-linux/files/bin/bin/wechat-devtools $out/bin/wechat_dev_tools-deb \
--prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
"''${gappsWrapperArgs[@]}"
'';
Expand Down

0 comments on commit cd68e34

Please sign in to comment.