diff options
Diffstat (limited to 'pkgs/applications/plasma-mobile')
-rw-r--r-- | pkgs/applications/plasma-mobile/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/plasma-mobile/neochat.nix | 21 | ||||
-rw-r--r-- | pkgs/applications/plasma-mobile/spacebar.nix | 8 |
3 files changed, 25 insertions, 8 deletions
diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix index 9e0cf1443e2b1..5c3caf42eb762 100644 --- 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 index 8147c4fb760e8..2ff22144780ee 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 diff --git a/pkgs/applications/plasma-mobile/spacebar.nix b/pkgs/applications/plasma-mobile/spacebar.nix index 6a40858cdccf9..7ec5541f48c8e 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 , 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 = [ |