pyrox.dev / nixpkgs
lol
fork atom

spacebar: remove gcc9 hack

K900 f08f903e b07f4b04

+2 -7
unified split
+1 -1
pkgs/applications/plasma-mobile/default.nix
··· 75 plasma-settings = callPackage ./plasma-settings.nix {}; 76 plasmatube = callPackage ./plasmatube {}; 77 qmlkonsole = callPackage ./qmlkonsole.nix {}; 78 - spacebar = callPackage ./spacebar.nix { inherit srcs; }; 79 tokodon = callPackage ./tokodon.nix {}; 80 }; 81
··· 75 plasma-settings = callPackage ./plasma-settings.nix {}; 76 plasmatube = callPackage ./plasmatube {}; 77 qmlkonsole = callPackage ./qmlkonsole.nix {}; 78 + spacebar = callPackage ./spacebar.nix {}; 79 tokodon = callPackage ./tokodon.nix {}; 80 }; 81
+1 -6
pkgs/applications/plasma-mobile/spacebar.nix
··· 1 { lib 2 , mkDerivation 3 - , gcc12Stdenv 4 - , srcs 5 6 , cmake 7 , extra-cmake-modules ··· 17 , knotifications 18 , kpeople 19 , libphonenumber 20 - , libqofono 21 , modemmanager-qt 22 , protobuf 23 , qcoro 24 , qtquickcontrols2 25 }: 26 27 - # Workaround for AArch64 still using GCC9. 28 - gcc12Stdenv.mkDerivation rec { 29 pname = "spacebar"; 30 - inherit (srcs.spacebar) version src; 31 32 nativeBuildInputs = [ 33 cmake
··· 1 { lib 2 , mkDerivation 3 4 , cmake 5 , extra-cmake-modules ··· 15 , knotifications 16 , kpeople 17 , libphonenumber 18 , modemmanager-qt 19 , protobuf 20 , qcoro 21 , qtquickcontrols2 22 }: 23 24 + mkDerivation { 25 pname = "spacebar"; 26 27 nativeBuildInputs = [ 28 cmake