From 28cbbb8bd4f589cb997d7bb2102c9379d07bee46 Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Fri, 5 Aug 2022 17:17:37 +1000 Subject: qcoro: 0.4.0 -> 0.6.0 And fix compilation on aarch64 by using gcc11Stdenv. Co-authored-by: Samuel Dionne-Riel --- pkgs/development/libraries/qcoro/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/qcoro/default.nix b/pkgs/development/libraries/qcoro/default.nix index d5d3fd8ba1bb..7fcbd489b4c9 100644 --- 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; }; } -- cgit v1.2.3 From 64e990c7f61e8fe101b8a9d35c1a9397e3ea3e2c Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Tue, 20 Sep 2022 21:09:40 -0400 Subject: neochat: Work around AArch64 not using gcc11Stdenv --- pkgs/applications/plasma-mobile/default.nix | 2 +- pkgs/applications/plasma-mobile/neochat.nix | 21 ++++++++++++++++----- 2 files changed, 17 insertions(+), 6 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix index 9e0cf1443e2b..01c3bbc416dc 100644 --- a/pkgs/applications/plasma-mobile/default.nix +++ b/pkgs/applications/plasma-mobile/default.nix @@ -73,7 +73,7 @@ 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 {}; diff --git a/pkgs/applications/plasma-mobile/neochat.nix b/pkgs/applications/plasma-mobile/neochat.nix index 8147c4fb760e..2ff22144780e 100644 --- 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 -- cgit v1.2.3 From 3a2ba06a838d773aa3dea5cdcdfb1b15b1ede8ae Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Tue, 20 Sep 2022 21:09:09 -0400 Subject: spacebar: Work around AArch64 not using gcc11Stdenv --- pkgs/applications/plasma-mobile/default.nix | 2 +- pkgs/applications/plasma-mobile/spacebar.nix | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix index 01c3bbc416dc..5c3caf42eb76 100644 --- a/pkgs/applications/plasma-mobile/default.nix +++ b/pkgs/applications/plasma-mobile/default.nix @@ -78,7 +78,7 @@ let 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/spacebar.nix b/pkgs/applications/plasma-mobile/spacebar.nix index 0e30c86df981..d5b4bdef9676 100644 --- 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 , kcontacts , ki18n @@ -18,12 +21,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 = [ -- cgit v1.2.3