Merge pull request #196047 from samueldr/fix/qcoro-0.6-aarch64-alt

qcoro: 0.4.0 -> 0.6.0 and AArch64 fix
NixOS · Oct 18, 2022 · b532957 · b532957
2 parents 7019a41 + 3a2ba06
commit b532957
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 14 deletions.
diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix
@@ -73,12 +73,12 @@ let
       krecorder = callPackage ./krecorder.nix {};
       ktrip = callPackage ./ktrip.nix {};
       kweather = callPackage ./kweather.nix {};
-      neochat = callPackage ./neochat.nix {};
+      neochat = callPackage ./neochat.nix { inherit srcs; };
       plasma-dialer = callPackage ./plasma-dialer.nix {};
       plasma-phonebook = callPackage ./plasma-phonebook.nix {};
       plasma-settings = callPackage ./plasma-settings.nix {};
       plasmatube = callPackage ./plasmatube.nix {};
-      spacebar = callPackage ./spacebar.nix {};
+      spacebar = callPackage ./spacebar.nix { inherit srcs; };
     };
 
 in lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/applications/plasma-mobile/neochat.nix b/pkgs/applications/plasma-mobile/neochat.nix
@@ -1,9 +1,13 @@
-{ mkDerivation
+{ gcc11Stdenv
 , lib
-, pkg-config
+, srcs
+
 , cmake
-, cmark
 , extra-cmake-modules
+, pkg-config
+, wrapQtAppsHook
+
+, cmark
 , kconfig
 , kdbusaddons
 , ki18n
@@ -25,10 +29,17 @@
 , sonnet
 }:
 
-mkDerivation rec {
+# Workaround for AArch64 not using GCC11 yet.
+gcc11Stdenv.mkDerivation rec {
   pname = "neochat";
+  inherit (srcs.neochat) version src;
 
-  nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ];
+  nativeBuildInputs = [
+    cmake
+    extra-cmake-modules
+    pkg-config
+    wrapQtAppsHook
+  ];
 
   buildInputs = [
     cmark

diff --git a/pkgs/applications/plasma-mobile/spacebar.nix b/pkgs/applications/plasma-mobile/spacebar.nix
@@ -1,8 +1,11 @@
 { lib
 , mkDerivation
+, gcc11Stdenv
+, srcs
 
 , cmake
 , extra-cmake-modules
+, wrapQtAppsHook
 
 , c-ares
 , curl
@@ -20,12 +23,15 @@
 , qtquickcontrols2
 }:
 
-mkDerivation rec {
+# Workaround for AArch64 not using GCC11 yet.
+gcc11Stdenv.mkDerivation rec {
   pname = "spacebar";
+  inherit (srcs.spacebar) version src;
 
   nativeBuildInputs = [
     cmake
     extra-cmake-modules
+    wrapQtAppsHook
   ];
 
   buildInputs = [

diff --git a/pkgs/development/libraries/qcoro/default.nix b/pkgs/development/libraries/qcoro/default.nix
@@ -1,30 +1,35 @@
-{ lib
-, mkDerivation
+{ stdenv
+, gcc11Stdenv
+, lib
 , fetchFromGitHub
 , cmake
 , libpthreadstubs
 , qtbase
+, qtwebsockets
+, wrapQtAppsHook
 }:
 
-mkDerivation rec {
+gcc11Stdenv.mkDerivation rec {
   pname = "qcoro";
-  version = "0.4.0";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "danvratil";
     repo = "qcoro";
     rev = "v${version}";
-    sha256 = "sha256-RVpyL+BklX8Wyk9Xj9UyuvNK5Vev8ZsrOSMxX1HtcHU=";
+    sha256 = "sha256-6kRWBzspwsO0Q6/8gQUr69DJjmkPa3lWrKTmSgVn6V4=";
   };
 
   outputs = [ "out" "dev" ];
 
   nativeBuildInputs = [
+    wrapQtAppsHook
     cmake
   ];
 
   buildInputs = [
     qtbase
+    qtwebsockets
     libpthreadstubs
   ];
 
@@ -34,6 +39,5 @@ mkDerivation rec {
     license = licenses.mit;
     maintainers = with maintainers; [ smitop ];
     platforms = platforms.linux;
-    badPlatforms = platforms.aarch64;
   };
 }