ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-22 21:18:28 +03:00
Code Issues Projects Releases Wiki Activity

spacebar: remove gcc9 hack

Browse Source
This commit is contained in:
K900 2023-03-18 01:39:35 +03:00
parent b07f4b040e
commit f08f903ea5
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/plasma-mobile/default.nix
View File

@ -75,7 +75,7 @@ let
plasma-settings = callPackage ./plasma-settings.nix {}; plasma-settings = callPackage ./plasma-settings.nix {};
plasmatube = callPackage ./plasmatube {}; plasmatube = callPackage ./plasmatube {};
qmlkonsole = callPackage ./qmlkonsole.nix {}; qmlkonsole = callPackage ./qmlkonsole.nix {};
spacebar = callPackage ./spacebar.nix { inherit srcs; }; spacebar = callPackage ./spacebar.nix {};
tokodon = callPackage ./tokodon.nix {}; tokodon = callPackage ./tokodon.nix {};
}; };

7
pkgs/applications/plasma-mobile/spacebar.nix
View File

@ -1,7 +1,5 @@
{ lib { lib
, mkDerivation , mkDerivation
, gcc12Stdenv
, srcs
, cmake , cmake
, extra-cmake-modules , extra-cmake-modules
@ -17,17 +15,14 @@
, knotifications , knotifications
, kpeople , kpeople
, libphonenumber , libphonenumber
, libqofono
, modemmanager-qt , modemmanager-qt
, protobuf , protobuf
, qcoro , qcoro
, qtquickcontrols2 , qtquickcontrols2
}: }:
# Workaround for AArch64 still using GCC9. mkDerivation {
gcc12Stdenv.mkDerivation rec {
pname = "spacebar"; pname = "spacebar";
inherit (srcs.spacebar) version src;
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake