status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix for qt15 overlay

This commit is contained in:
Siddarth Kumar 2024-07-22 20:21:12 +05:30
parent b02eb7f753
commit 1c7f4b7d35
No known key found for this signature in database
GPG Key ID: 599D10112BF518DB
2 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
nix/overlay.nix
View File

@ -6,7 +6,13 @@
# - https://nixos.org/nixos/nix-pills/callpackage-design-pattern.html # - https://nixos.org/nixos/nix-pills/callpackage-design-pattern.html
final: prev: let final: prev: let
inherit (prev) config stdenv callPackage recurseIntoAttrs makeOverridable fetchurl lib writeShellScriptBin __splicedPackages; inherit (prev) config stdenv callPackage recurseIntoAttrs makeOverridable fetchurl lib writeShellScriptBin;
# makeScopeWithSplicing' generateSplicesForMkScope
# writeShellScriptBin __splicedPackages
# makeSetupHook fetchgit fetchpatch fetchFromGitHub makeWrapper
# bison cups harfbuzz libGL perl python3
# gstreamer gst-plugins-base gtk3 dconf
# llvmPackages_15 darwin;
in rec { in rec {
linuxdeployqt = callPackage ./pkgs/linuxdeployqt/default.nix { }; linuxdeployqt = callPackage ./pkgs/linuxdeployqt/default.nix { };
@ -42,23 +48,25 @@ in rec {
"${final.bash}/bin/sh" "${final.glibc.bin}/bin/ldd" "$@" "${final.bash}/bin/sh" "${final.glibc.bin}/bin/ldd" "$@"
''; '';
# Qt 5.15.8 copy from 76973ae3b30a88ea415f27ff53809ab8f452e2ec
# Edited: qt515_14 = callPackage ./pkgs/qt-5/5.15/default.nix {
# - temporary break Darwin support # inherit lib stdenv fetchurl fetchgit fetchpatch fetchFromGitHub makeSetupHook makeWrapper makeScopeWithSplicing';
# - remove unsupported testers, env., config.allowAliases # inherit bison cups harfbuzz libGL perl python3;
# - mkDerivation without finalAttrs # inherit gstreamer gst-plugins-base gtk3 dconf;
# - change fetch* parameter from hash to sha256, rmove fetchLFS # inherit llvmPackages_15;
# - fix makeSetupHook # inherit darwin;
# - switch from makeScopeWithSplicing back to makeScope # inherit generateSplicesForMkScope;
# See diff for a full list of changes #
qt515_8 = recurseIntoAttrs (makeOverridable # overrideSDK = prev.darwin.overrideSDK or (x: x);
(import ./pkgs/qt-5/5.15) { # overrideLibcxx = prev.darwin.overrideLibcxx or (x: x);
inherit (__splicedPackages) #
newScope generateSplicesForMkScope lib fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper # # Options
bison cups dconf harfbuzz libGL perl gtk3 python3 # developerBuild = false;
darwin buildPackages; # decryptSslTraffic = false;
inherit (__splicedPackages.gst_all_1) gstreamer gst-plugins-base; # debug = false;
inherit config stdenv; # inherit config;
}); };
alsa-lib = prev.alsaLib; alsa-lib = prev.alsaLib;
} }

6
shell.nix
View File

@ -3,7 +3,7 @@
}: }:
let let
qtCustom = (with pkgs.qt515_8; qtCustom = (with pkgs.qt515_14;
# TODO:check the required modules # TODO:check the required modules
env "qt-custom-${qtbase.version}" ([ env "qt-custom-${qtbase.version}" ([
qtbase qtbase
@ -46,7 +46,7 @@ in pkgs.mkShell {
QTDIR = qtCustom; QTDIR = qtCustom;
# TODO: still needed? # TODO: still needed?
# https://github.com/NixOS/nixpkgs/pull/109649 # https://github.com/NixOS/nixpkgs/pull/109649
QT_INSTALL_PLUGINS = "${qtCustom}/${pkgs.qt515_8.qtbase.qtPluginPrefix}"; QT_INSTALL_PLUGINS = "${qtCustom}/${pkgs.qt515_14.qtbase.qtPluginPrefix}";
shellHook = '' shellHook = ''
export MAKEFLAGS="-j$NIX_BUILD_CORES" export MAKEFLAGS="-j$NIX_BUILD_CORES"
@ -54,7 +54,7 @@ in pkgs.mkShell {
''; '';
LIBKRB5_PATH = pkgs.libkrb5; LIBKRB5_PATH = pkgs.libkrb5;
QTWEBENGINE_PATH = pkgs.qt515_8.qtwebengine.out; QTWEBENGINE_PATH = pkgs.qt515_14.qtwebengine.out;
GSTREAMER_PATH = pkgs.gst_all_1.gstreamer; GSTREAMER_PATH = pkgs.gst_all_1.gstreamer;
NSS_PATH = pkgs.nss; NSS_PATH = pkgs.nss;