mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-22 21:18:28 +03:00
spacebar: remove gcc9 hack
This commit is contained in:
parent
b07f4b040e
commit
f08f903ea5
@ -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 {};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user