colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

neochat: Work around AArch64 not using gcc11Stdenv

Browse Source
This commit is contained in:
Samuel Dionne-Riel 2022-09-20 21:09:40 -04:00
parent 28cbbb8bd4
commit 64e990c7f6
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,7 +73,7 @@ let
krecorder = callPackage ./krecorder.nix {}; krecorder = callPackage ./krecorder.nix {};
ktrip = callPackage ./ktrip.nix {}; ktrip = callPackage ./ktrip.nix {};
kweather = callPackage ./kweather.nix {}; kweather = callPackage ./kweather.nix {};
neochat = callPackage ./neochat.nix {}; neochat = callPackage ./neochat.nix { inherit srcs; };
plasma-dialer = callPackage ./plasma-dialer.nix {}; plasma-dialer = callPackage ./plasma-dialer.nix {};
plasma-phonebook = callPackage ./plasma-phonebook.nix {}; plasma-phonebook = callPackage ./plasma-phonebook.nix {};
plasma-settings = callPackage ./plasma-settings.nix {}; plasma-settings = callPackage ./plasma-settings.nix {};

21
pkgs/applications/plasma-mobile/neochat.nix
View File

@ -1,9 +1,13 @@
{ mkDerivation { gcc11Stdenv
, lib , lib
, pkg-config , srcs
, cmake , cmake
, cmark
, extra-cmake-modules , extra-cmake-modules
, pkg-config
, wrapQtAppsHook
, cmark
, kconfig , kconfig
, kdbusaddons , kdbusaddons
, ki18n , ki18n
@ -25,10 +29,17 @@
, sonnet , sonnet
}: }:
mkDerivation rec { # Workaround for AArch64 not using GCC11 yet.
gcc11Stdenv.mkDerivation rec {
pname = "neochat"; pname = "neochat";
inherit (srcs.neochat) version src;
nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; nativeBuildInputs = [
cmake
extra-cmake-modules
pkg-config
wrapQtAppsHook
];
buildInputs = [ buildInputs = [
cmark cmark