Unverified Commit 89dbed53 authored by rewine's avatar rewine Committed by GitHub
Browse files

deepin: resolve compilation issues on qt 6.9 (#398294)

parents 908a512f 6579406d

pkgs/desktops/deepin/core/dde-shell/default.nix

+9 −2
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  stdenv,

  lib,

  fetchFromGitHub,

  fetchpatch,

  cmake,

  extra-cmake-modules,

  pkg-config,
@@ -23,17 +24,23 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "dde-shell";

  version = "1.0.9";

  version = "1.0.10";



  src = fetchFromGitHub {

    owner = "linuxdeepin";

    repo = "dde-shell";

    rev = finalAttrs.version;

    hash = "sha256-Gko1fFut5zWH/L6X5hEe5OZBjRIbKWIrrjjhh2wrsCg=";

    hash = "sha256-0nyTvSIJglx8raehPi6pYfQcxIjsCAaD1hVbuGvtfY8=";

  };



  patches = [

    ./fix-path-for-nixos.diff

    (fetchpatch {

      name = "resolve-compilation-issues-on-Qt-6_9.patch";

      url = "https://github.com/linuxdeepin/dde-shell/commit/936d62a2c20398b9ca6ae28f9101dd288c8b1678.patch";

      hash = "sha256-u5TcPy2kZsOLGUgjTGZ5JX3mWnr/rOQ3SWBRyjWEiw4=";

    })



  ];



  postPatch = ''

pkgs/desktops/deepin/library/dtk6core/default.nix

+8 −2
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  stdenv,

  lib,

  fetchFromGitHub,

  fetchpatch,

  cmake,

  pkg-config,

  doxygen,
@@ -14,18 +15,23 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "dtk6core";

  version = "6.0.24";

  version = "6.0.33";



  src = fetchFromGitHub {

    owner = "linuxdeepin";

    repo = "dtk6core";

    rev = finalAttrs.version;

    hash = "sha256-51TvPQy0b/8kkBs0e3q1B53mEAKHpAYPBla4h1k616c=";

    hash = "sha256-AmGQoDt9qp0m0iV7WrR16DPTt80Y5leRUVXPOtHeugs=";

  };



  patches = [

    ./fix-pkgconfig-path.patch

    ./fix-pri-path.patch

    (fetchpatch {

      name = "resolve-compilation-issues-on-Qt-6_9.patch";

      url = "https://github.com/linuxdeepin/dtkcore/commit/8f523a8b387a006b942268e2143d0d58c574f7c5.patch";

      hash = "sha256-x8BfWCdsz8Bf/sAM7PymZWqlPyEabwP0e6ybfz/2oZ4=";

    })

  ];



  postPatch = ''

pkgs/desktops/deepin/library/dtk6declarative/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -11,13 +11,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "dtk6declarative";

  version = "6.0.24";

  version = "6.0.33";



  src = fetchFromGitHub {

    owner = "linuxdeepin";

    repo = "dtk6declarative";

    rev = finalAttrs.version;

    hash = "sha256-i6gkVWs6CQC6i6H6lfrWNYT76fFBc8ECZ1ePvXQ7j8E=";

    hash = "sha256-hFH5XCeNs31hslaPMyuXBLe0Du3s6STs9kltwL+/F1s=";

  };



  patches = [

pkgs/desktops/deepin/library/dtk6gui/default.nix

+8 −2
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  stdenv,

  lib,

  fetchFromGitHub,

  fetchpatch,

  cmake,

  pkg-config,

  doxygen,
@@ -12,18 +13,23 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "dtk6gui";

  version = "6.0.24";

  version = "6.0.33";



  src = fetchFromGitHub {

    owner = "linuxdeepin";

    repo = "dtk6gui";

    rev = finalAttrs.version;

    hash = "sha256-Ybi68lTSUJpAipx92JF7wj6y+GTYDodJKRCVFhfnBvQ=";

    hash = "sha256-ZnRhrlgrQ7Vusod2diFwVEVnNGHYNq5Ij12GbW6LXWc=";

  };



  patches = [

    ./fix-pkgconfig-path.patch

    ./fix-pri-path.patch

    (fetchpatch {

      name = "resolve-compilation-issues-on-Qt-6_9.patch";

      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dtk6gui/-/raw/ae64c77a73cdea069579ecf6833be63635237180/qt-6.9.patch";

      hash = "sha256-45L3ZQ9Hv7tLdDjtazLhVl8XgKBtcHL3CT2nw6GkqgM=";

    })

  ];



  postPatch = ''

pkgs/desktops/deepin/library/dtk6log/default.nix

+11 −2
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  stdenv,

  lib,

  fetchFromGitHub,

  fetchpatch,

  cmake,

  pkg-config,

  qt6Packages,
@@ -12,15 +13,23 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "dtk6log";

  version = "0.0.1";

  version = "0.0.2";



  src = fetchFromGitHub {

    owner = "linuxdeepin";

    repo = "dtk6log";

    rev = finalAttrs.version;

    hash = "sha256-R+jxlS8/FXUxnnzIDIePU2NwwNQU624n++E3q3oElco=";

    hash = "sha256-uPuka+uVCcl2sBMr1SpgqLpcIqZm6BDZyGd7FOraHVM=";

  };



  patches = [

    (fetchpatch {

      name = "resolve-compilation-issues-on-Qt-6_9.patch";

      url = "https://github.com/linuxdeepin/dtklog/commit/ab7ed5aa8433c726470f2aecc1d99f118eae8b63.patch";

      hash = "sha256-QK4MOAzTZjjK5qfmzguXAgHO9guMCRN/5y+llBSY2vk=";

    })

  ];



  nativeBuildInputs = [

    cmake

    pkg-config