deepin desktop environment: 2024.09 update (#337842) (69a81b09) · Commits · mdf / nixpkgs

pkgs/desktops/deepin/apps/deepin-editor/default.nix

+9 −14

Original line number	Diff line number	Diff line
		@@ -4,48 +4,43 @@
		fetchFromGitHub,
		cmake,
		pkg-config,
		qttools,
		wrapQtAppsHook,
		dtkwidget,
		qt5integration,
		qt5platform-plugins,
		qtbase,
		qtsvg,
		dde-qt-dbus-factory,
		kcodecs,
		syntax-highlighting,
		libchardet,
		libuchardet,
		libiconv,
		libsForQt5,
		}:

		stdenv.mkDerivation rec {
		pname = "deepin-editor";
		version = "6.5.0";
		version = "6.5.2";

		src = fetchFromGitHub {
		owner = "linuxdeepin";
		repo = pname;
		rev = version;
		hash = "sha256-f6CJlSgsKU311ziXmm7Ado8tH+3dNRpWB1e4TewVf/8=";
		hash = "sha256-Z3fsnjo4Pcu1e8lKvWdWBhpoOFFy0dSrI2HehRYKJ0k=";
		};

		nativeBuildInputs = [
		cmake
		pkg-config
		qttools
		wrapQtAppsHook
		libsForQt5.qttools
		libsForQt5.wrapQtAppsHook
		];

		buildInputs = [
		dtkwidget
		qt5integration
		qt5platform-plugins
		qtbase
		qtsvg
		libsForQt5.qtbase
		libsForQt5.qtsvg
		dde-qt-dbus-factory
		kcodecs
		syntax-highlighting
		libsForQt5.kcodecs
		libsForQt5.syntax-highlighting
		libchardet
		libuchardet
		libiconv

pkgs/desktops/deepin/core/dde-control-center/default.nix

+16 −35

Original line number	Diff line number	Diff line
		@@ -4,35 +4,28 @@
		fetchFromGitHub,
		cmake,
		pkg-config,
		qttools,
		doxygen,
		wrapQtAppsHook,
		wrapGAppsHook3,
		wayland-scanner,
		wayland,
		dtkwidget,
		qt5integration,
		qt5platform-plugins,
		libsForQt5,
		deepin-pw-check,
		qtbase,
		qtx11extras,
		qtmultimedia,
		polkit-qt,
		libxcrypt,
		librsvg,
		gtest,
		runtimeShell,
		dbus,
		}:

		stdenv.mkDerivation rec {
		pname = "dde-control-center";
		version = "6.0.59";
		version = "6.0.65";

		src = fetchFromGitHub {
		owner = "linuxdeepin";
		repo = pname;
		rev = version;
		hash = "sha256-OniY/B/9319AYYFFPnsUMNrnc0yVGG3rfCLPjgNFyag=";
		hash = "sha256-9v2UtLjQQ3OX69UxMknLlrQhorahDI4Z4EEHItBs7G0=";
		};

		postPatch = ''
		@@ -43,24 +36,22 @@ stdenv.mkDerivation rec {
		nativeBuildInputs = [
		cmake
		pkg-config
		qttools
		libsForQt5.qttools
		doxygen
		wrapQtAppsHook
		wrapGAppsHook3
		libsForQt5.wrapQtAppsHook
		wayland-scanner
		];
		dontWrapGApps = true;

		buildInputs = [
		wayland
		dtkwidget
		qt5platform-plugins
		qt5integration
		deepin-pw-check
		qtbase
		qtx11extras
		qtmultimedia
		polkit-qt
		libsForQt5.qtbase
		libsForQt5.qtmultimedia
		libsForQt5.polkit-qt
		libxcrypt
		librsvg
		gtest
		];

		@@ -79,17 +70,7 @@ stdenv.mkDerivation rec {
		preConfigure = ''
		# qt.qpa.plugin: Could not find the Qt platform plugin "minimal"
		# A workaround is to set QT_PLUGIN_PATH explicitly
		export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix}
		'';

		# qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
		qtWrapperArgs = [
		"--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
		"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ librsvg ]}"
		];

		preFixup = ''
		qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
		export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix}
		'';

		outputs = [
		@@ -97,12 +78,12 @@ stdenv.mkDerivation rec {
		"dev"
		];

		meta = with lib; {
		meta = {
		description = "Control panel of Deepin Desktop Environment";
		mainProgram = "dde-control-center";
		homepage = "https://github.com/linuxdeepin/dde-control-center";
		license = licenses.gpl3Plus;
		platforms = platforms.linux;
		maintainers = teams.deepin.members;
		license = lib.licenses.gpl3Plus;
		platforms = lib.platforms.linux;
		maintainers = lib.teams.deepin.members;
		};
		}

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -13,13 +13,13 @@

		stdenv.mkDerivation rec {
		pname = "dde-launchpad";
		version = "0.8.4";
		version = "1.0.2";

		src = fetchFromGitHub {
		owner = "linuxdeepin";
		repo = pname;
		rev = version;
		hash = "sha256-MPOzKAgwhJa7pMO6EZ6vYyYgZSD/SbU/L0L1dkN9/po=";
		hash = "sha256-kczdSd9+ZmMZQ2fWg3SRW+CS/aWktYLz/H+Ky81TwVM=";
		};

		nativeBuildInputs = [
		@@ -45,12 +45,12 @@ stdenv.mkDerivation rec {

		cmakeFlags = [ "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user" ];

		meta = with lib; {
		meta = {
		description = "'launcher' or 'start menu' component for DDE";
		mainProgram = "dde-launchpad";
		homepage = "https://github.com/linuxdeepin/dde-launchpad";
		license = licenses.gpl3Plus;
		platforms = platforms.linux;
		maintainers = teams.deepin.members;
		license = lib.licenses.gpl3Plus;
		platforms = lib.platforms.linux;
		maintainers = lib.teams.deepin.members;
		};
		}

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

+12 −16

Original line number	Diff line number	Diff line
		@@ -3,44 +3,40 @@
		lib,
		fetchFromGitHub,
		cmake,
		qttools,
		pkg-config,
		wrapQtAppsHook,
		qtbase,
		qtsvg,
		dtkwidget,
		dde-control-center,
		dde-session-shell,
		networkmanager-qt,
		libsForQt5,
		glib,
		gtest,
		}:

		stdenv.mkDerivation rec {
		pname = "dde-network-core";
		version = "2.0.32";
		version = "2.0.34";

		src = fetchFromGitHub {
		owner = "linuxdeepin";
		repo = pname;
		rev = version;
		hash = "sha256-dXLvBCNitlV07dH/rPatsbP6DFf8SZQ7hcDUYtqt2FA=";
		hash = "sha256-bS/PkutP5BQtqZ6MzeImFyGKoztoTswXhXaEftEv0FI=";
		};

		nativeBuildInputs = [
		cmake
		qttools
		libsForQt5.qttools
		pkg-config
		wrapQtAppsHook
		libsForQt5.wrapQtAppsHook
		];

		buildInputs = [
		qtbase
		qtsvg
		libsForQt5.qtbase
		libsForQt5.qtsvg
		dtkwidget
		dde-control-center
		dde-session-shell
		networkmanager-qt
		libsForQt5.networkmanager-qt
		glib
		gtest
		];
		@@ -49,11 +45,11 @@ stdenv.mkDerivation rec {

		strictDeps = true;

		meta = with lib; {
		meta = {
		description = "DDE network library framework";
		homepage = "https://github.com/linuxdeepin/dde-network-core";
		license = licenses.gpl3Plus;
		platforms = platforms.linux;
		maintainers = teams.deepin.members;
		license = lib.licenses.gpl3Plus;
		platforms = lib.platforms.linux;
		maintainers = lib.teams.deepin.members;
		};
		}

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

+2 −8

Original line number	Diff line number	Diff line
		@@ -2,7 +2,6 @@
		stdenv,
		lib,
		fetchFromGitHub,
		fetchpatch,
		cmake,
		extra-cmake-modules,
		pkg-config,
		@@ -23,22 +22,17 @@

		stdenv.mkDerivation (finalAttrs: {
		pname = "dde-shell";
		version = "0.0.43";
		version = "1.0.2";

		src = fetchFromGitHub {
		owner = "linuxdeepin";
		repo = "dde-shell";
		rev = finalAttrs.version;
		hash = "sha256-wSk1gEJbTxKUPZ6DiTeVw2qyX+CwANA37ZP0tXnz0J0=";
		hash = "sha256-I3z6HL1h3qmLfOrwhyLhtSz3og4kHcAdlHJx4+SgPRo=";
		};

		patches = [
		./fix-path-for-nixos.diff
		(fetchpatch {
		name = "fix-libdock-plugin_so-contains-a-forbidden-reference.diff";
		url = "https://github.com/linuxdeepin/dde-shell/commit/bf9a0472bc44748a3c389d796d144dad6b13617b.patch";
		hash = "sha256-cP5zMsfPyi4FIR1OIbVSnn+Z+KqRuIK7a214VjVb/7w=";
		})
		];

		postPatch = ''

Admin message