dont fail

status-im · Jan 12, 2024 · 9949dd1 · 9949dd1
1 parent b99d3cb
commit 9949dd1
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 29 deletions.
diff --git a/Makefile b/Makefile
@@ -637,7 +637,7 @@ endif
 	echo -e $(BUILD_MSG) "AppImage"
 ifdef IN_NIX_SHELL
 	# WARN: unsupported new glibc and bundle everything
-	linuxdeployqt tmp/linux/dist/nim-status.desktop -unsupported-bundle-everything -unsupported-allow-new-glibc -no-copy-copyright-files -qmldir=ui -qmlimport=$(QT5_QMLDIR) -bundle-non-qt-libs -verbose=3
+	linuxdeployqt tmp/linux/dist/nim-status.desktop -unsupported-bundle-everything -unsupported-allow-new-glibc -no-copy-copyright-files -qmldir=ui -qmlimport=$(QT5_QMLDIR) -bundle-non-qt-libs -verbose=3 || true
 	linuxdeployqt tmp/linux/dist/nim-status.desktop -unsupported-bundle-everything -unsupported-allow-new-glibc -no-copy-copyright-files -qmldir=ui -qmlimport=$(QT5_QMLDIR) -bundle-non-qt-libs -verbose=3
 
 	patchelf --set-interpreter /lib64/ld-linux-x86-64.so.2 tmp/linux/dist/usr/bin/nim_status_client

diff --git a/nix/pkgs/linuxdeployqt/default.nix b/nix/pkgs/linuxdeployqt/default.nix
@@ -5,13 +5,14 @@
 stdenv.mkDerivation rec {
   pname = "linuxdeployqt";
   version = "20230423-8428c59";
-  commit = "8428c59318b250058e6cf93353e2871072bbf7f9";
+  commit = "2b38449ca9e9c68ad53e28531c017910ead6ebc4";
 
   src = fetchFromGitHub {
     owner = "probonopd";
     repo = "linuxdeployqt";
     rev = commit;
-    sha256 = "sha256-b1iWpWQRRSjmkNVuWTKRjzxmWGy4czteYNgFWb6Lofs=";
+    #sha256 = "sha256-b1iWpWQRRSjmkNVuWTKRjzxmWGy4czteYNgFWb6Lofs=";
+    sha256 = "sha256-2VIVYfYFhgDxaeSYwdsmoG/elf58SPLC1z2rEhde4rw=";
   };
 
   dontWrapQtApps = true;

diff --git a/shell.nix b/shell.nix
@@ -50,30 +50,31 @@ in pkgs.mkShell {
   # https://github.com/NixOS/nixpkgs/pull/109649
   QT_INSTALL_PLUGINS = "${qtCustom}/${pkgs.qt515.qtbase.qtPluginPrefix}";
 
-  LD_LIBRARY_PATH = with pkgs; lib.makeLibraryPath [
-    alsa-lib
-    expat
-    fontconfig
-    freetype
-    gcc-unwrapped
-    glib
-    gmp
-    gst_all_1.gst-plugins-base
-    gst_all_1.gstreamer
-    harfbuzz
-    libglvnd
-    libkrb5
-    libpng
-    libpulseaudio
-    libxkbcommon
-    p11-kit
-    xorg.libICE
-    xorg.libSM
-    xorg.libXrender
-    xorg.xcbutilimage
-    xorg.xcbutilkeysyms
-    xorg.xcbutilrenderutil
-    xorg.xcbutilwm
-    zlib
- ];
+  #LD_LIBRARY_PATH = with pkgs; lib.makeLibraryPath [
+  #  #alsa-lib
+  #  #expat
+  #  #fontconfig
+  #  #freetype
+  #  #gcc-unwrapped
+  #  #glib
+  #  #gmp
+  #  #gst_all_1.gst-plugins-base
+  #  #gst_all_1.gstreamer
+  #  #harfbuzz
+  #  #libglvnd
+  #  #libkrb5
+  #  #libpng
+  #  #libpulseaudio
+  #  #libxkbcommon
+  #  #p11-kit
+  #  #xorg.libICE
+  #  #xorg.libSM
+  #  #xorg.libXrender
+  #  #xorg.xcbutilimage
+  #  #xorg.xcbutilkeysyms
+  #  #xorg.xcbutilrenderutil
+  #  #xorg.xcbutilwm
+  #  #zlib
+  #  #xorg.libX11
+ #];
 }