diff options
author | José Romildo Malaquias <malaquias@gmail.com> | 2020-05-04 10:18:08 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-04 10:18:08 -0300 |
commit | 44a43c99d8eb3cbc870f509fb5a0203d8cfba515 (patch) | |
tree | db1808d74bb8241f6853ad4ce00429a36178b59c /pkgs/desktops/deepin | |
parent | 00d4fd25943d58cd05aa083e72b4ada7b480746a (diff) | |
parent | 65527129079f45ce21652a1f26ae621fa74bd546 (diff) | |
download | nixpkgs-44a43c99d8eb3cbc870f509fb5a0203d8cfba515.tar nixpkgs-44a43c99d8eb3cbc870f509fb5a0203d8cfba515.tar.gz nixpkgs-44a43c99d8eb3cbc870f509fb5a0203d8cfba515.tar.bz2 nixpkgs-44a43c99d8eb3cbc870f509fb5a0203d8cfba515.tar.lz nixpkgs-44a43c99d8eb3cbc870f509fb5a0203d8cfba515.tar.xz nixpkgs-44a43c99d8eb3cbc870f509fb5a0203d8cfba515.tar.zst nixpkgs-44a43c99d8eb3cbc870f509fb5a0203d8cfba515.zip |
Merge pull request #85883 from romildo/fix.deepin-anything
deepin.deepin-anything: fix building with linux kernel 5.6
Diffstat (limited to 'pkgs/desktops/deepin')
-rw-r--r-- | pkgs/desktops/deepin/deepin-anything/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/desktops/deepin/deepin-anything/default.nix b/pkgs/desktops/deepin/deepin-anything/default.nix index 7697c23ae14..be7fe818e5c 100644 --- a/pkgs/desktops/deepin/deepin-anything/default.nix +++ b/pkgs/desktops/deepin/deepin-anything/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qtbase, udisks2-qt5, utillinux, +{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, pkgconfig, qtbase, udisks2-qt5, utillinux, dtkcore, deepin }: mkDerivation rec { @@ -12,6 +12,16 @@ mkDerivation rec { sha256 = "1kvyffrii4b012f6ld1ih14qrn7gg5cxbdpbkac0wxb22hnz0azm"; }; + patches = [ + # fix compilation error and add support to kernel 5.6 + # https://github.com/linuxdeepin/deepin-anything/pull/27 + (fetchpatch { + name = "linux-5.6.patch"; + url = "https://github.com/linuxdeepin/deepin-anything/commit/764b820c2bcd7248993349b32f91043fc58ee958.patch"; + sha256 = "1ww4xllxc2s04px6fy8wp5cyw54xaz155ry30sqz21vl8awfr36h"; + }) + ]; + outputs = [ "out" "modsrc" ]; nativeBuildInputs = [ |