diff options
| author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2022-09-20 21:09:09 -0400 |
|---|---|---|
| committer | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2022-10-14 15:47:28 -0400 |
| commit | 3a2ba06a838d773aa3dea5cdcdfb1b15b1ede8ae (patch) | |
| tree | edb754f770c7115b12c7ab05f967291efb70efbf /pkgs/applications/plasma-mobile | |
| parent | 64e990c7f61e8fe101b8a9d35c1a9397e3ea3e2c (diff) | |
spacebar: Work around AArch64 not using gcc11Stdenv
Diffstat (limited to 'pkgs/applications/plasma-mobile')
| -rw-r--r-- | pkgs/applications/plasma-mobile/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/plasma-mobile/spacebar.nix | 8 |
2 files changed, 8 insertions, 2 deletions
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 = [ |