Unverified Commit 562e2b13 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #226604 from wineee/dde-file-manager 

util-dfm: 1.2.7 -> 1.2.8; dde-file-manager: 6.0.13 -> 6.0.14
parents 51b1fde6 1cc5062c

pkgs/desktops/deepin/core/dde-file-manager/default.nix

+2 −31
Original line number Diff line number Diff line 
{ stdenv

, lib

, fetchFromGitHub

, fetchpatch

, runtimeShell

, dtkwidget

, qt5integration
@@ -44,13 +43,13 @@ 


stdenv.mkDerivation rec {

  pname = "dde-file-manager";

  version = "6.0.13";

  version = "6.0.14";



  src = fetchFromGitHub {

    owner = "linuxdeepin";

    repo = pname;

    rev = version;

    sha256 = "sha256-Kn8LuAQNWY2SwzKjMyylEAlQNxsP+3bl5hM83yHfjvo=";

    sha256 = "sha256-88Ddc3986hyFMA0bYCxiupASI+pGLqjb3igOHLA8Q/g=";

  };



  nativeBuildInputs = [
@@ -62,34 +61,6 @@ stdenv.mkDerivation rec { 
  ];

  dontWrapGApps = true;



  patches = [

    (fetchpatch {

      name = "chore-cmake-use_CMAKE_INSTALL_SYSCONFDIR.patch";

      url = "https://github.com/linuxdeepin/dde-file-manager/commit/b3b6b1e5ace0fdd86d0a94687a4e60e7bdfb1086.patch";

      sha256 = "sha256-GEMuMa1UMSGf0dlHZRQyR1hC08U0GlAlmUKLIxzzoc4=";

    })

    (fetchpatch {

      name = "feat-GRANDSEARCHDAEMON_LIB_DIR-use-CMAKE_INSTALL_FULL_LIBDIR.patch";

      url = "https://github.com/linuxdeepin/dde-file-manager/commit/58e3826fc4ad46145b57c2b6f8ca2c74efd8d4d3.patch";

      sha256 = "sha256-athDoFhQ9v9cXOf4YKmZld1RScX43+6/q1zBa/1yAgQ=";

    })

    (fetchpatch {

      name = "fix-include-path-should-follow-Qt5Widgets_PRIVATE_INCLUDE_DIRS.patch";

      url = "https://github.com/linuxdeepin/dde-file-manager/commit/19fdfffc6ddba2844176ee8384e4147bebee9be4.patch";

      sha256 = "sha256-VPyiKKxFgNsY70ZdYE5oNF8BFosq/92YrZuZ882Fj4E=";

    })

    (fetchpatch {

      name = "chore-do-not-hardcode-APPSHAREDIR.patch";

      url = "https://github.com/linuxdeepin/dde-file-manager/commit/74f5cbda8114e24259b6fd998ade794e7880c725.patch";

      sha256 = "sha256-oZQcuPP9JTZ7aybPnmY/6RyqmJhvpxer4mhv+XpqeQY=";

    })

    (fetchpatch {

      name = "fix-use-pkgconfig-to-check-mount.patch";

      url = "https://github.com/linuxdeepin/dde-file-manager/commit/4d5be539ba2c567bee1ec4aad90ecda0b87878d5.patch";

      sha256 = "sha256-k808IsaV/RJg7bYNmUnhcFZMnMRQ8sGRagMlx5i4h4Q=";

    })

  ];



  postPatch = ''

    patchShebangs .

pkgs/desktops/deepin/library/util-dfm/default.nix

+2 −11
Original line number Diff line number Diff line 
{ stdenv

, lib

, fetchFromGitHub

, fetchpatch

, cmake

, pkg-config

, qtbase
@@ -14,23 +13,15 @@ 


stdenv.mkDerivation rec {

  pname = "util-dfm";

  version = "1.2.7";

  version = "1.2.8";



  src = fetchFromGitHub {

    owner = "linuxdeepin";

    repo = pname;

    rev = version;

    sha256 = "sha256-+qqirRkvVyKvt+Pu/ghQjMe+O6a7/7IoJL8AWL4QlvE=";

    sha256 = "sha256-Mc3x0nTnEyMnruZotiT1J4BGOeNAQlCXGbO0yVJtqYM=";

  };



  patches = [

    (fetchpatch {

      name = "fix-use-pkgconfig-to-check-mount.patch";

      url = "https://github.com/linuxdeepin/util-dfm/commit/fb8425a8c13f16e86db38ff84f43347fdc8ea468.diff";

      sha256 = "sha256-PGSRfnQ1MGmq0V3NBCoMk4p/T2x19VA04u9C+WcBKow=";

    })

  ];



  nativeBuildInputs = [

    cmake

    pkg-config