diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-05 19:51:09 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-05 19:51:09 +0200 |
| commit | 9875bbae75231f395ab020fbef6cbae698cc75c5 (patch) | |
| tree | eabae7448bcbba0d55420a068f5f55728e1736dc /pkgs/desktops/deepin | |
| parent | 320f79365d41aef687a07b50c725926932c9372b (diff) | |
| parent | 73dc3fc400141176138c95ea9c3f28750b2608e6 (diff) | |
| download | nixlib-9875bbae75231f395ab020fbef6cbae698cc75c5.tar nixlib-9875bbae75231f395ab020fbef6cbae698cc75c5.tar.gz nixlib-9875bbae75231f395ab020fbef6cbae698cc75c5.tar.bz2 nixlib-9875bbae75231f395ab020fbef6cbae698cc75c5.tar.lz nixlib-9875bbae75231f395ab020fbef6cbae698cc75c5.tar.xz nixlib-9875bbae75231f395ab020fbef6cbae698cc75c5.tar.zst nixlib-9875bbae75231f395ab020fbef6cbae698cc75c5.zip | |
Merge master into staging-next
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 7697c23ae141..be7fe818e5c1 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 = [ |