From f08f903ea5554c1737f55a3d06804bd691258f2f Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 18 Mar 2023 01:39:35 +0300 Subject: [PATCH] spacebar: remove gcc9 hack --- pkgs/applications/plasma-mobile/default.nix | 2 +- pkgs/applications/plasma-mobile/spacebar.nix | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix index 34f28ae7ff5d..255b3828f768 100644 --- a/pkgs/applications/plasma-mobile/default.nix +++ b/pkgs/applications/plasma-mobile/default.nix @@ -75,7 +75,7 @@ let plasma-settings = callPackage ./plasma-settings.nix {}; plasmatube = callPackage ./plasmatube {}; qmlkonsole = callPackage ./qmlkonsole.nix {}; - spacebar = callPackage ./spacebar.nix { inherit srcs; }; + spacebar = callPackage ./spacebar.nix {}; tokodon = callPackage ./tokodon.nix {}; }; diff --git a/pkgs/applications/plasma-mobile/spacebar.nix b/pkgs/applications/plasma-mobile/spacebar.nix index c120851e5b2e..659b92228d2c 100644 --- a/pkgs/applications/plasma-mobile/spacebar.nix +++ b/pkgs/applications/plasma-mobile/spacebar.nix @@ -1,7 +1,5 @@ { lib , mkDerivation -, gcc12Stdenv -, srcs , cmake , extra-cmake-modules @@ -17,17 +15,14 @@ , knotifications , kpeople , libphonenumber -, libqofono , modemmanager-qt , protobuf , qcoro , qtquickcontrols2 }: -# Workaround for AArch64 still using GCC9. -gcc12Stdenv.mkDerivation rec { +mkDerivation { pname = "spacebar"; - inherit (srcs.spacebar) version src; nativeBuildInputs = [ cmake