diff options
Diffstat (limited to 'pkgs/desktops/deepin')
8 files changed, 223 insertions, 14 deletions
diff --git a/pkgs/desktops/deepin/apps/deepin-camera/default.nix b/pkgs/desktops/deepin/apps/deepin-camera/default.nix index 27556ed73e046..95e1c9eeb49f4 100644 --- a/pkgs/desktops/deepin/apps/deepin-camera/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-camera/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DVERSION=${version}" ]; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString [ "-I${gst_all_1.gstreamer.dev}/include/gstreamer-1.0" "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0" ]; diff --git a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix index d62c72ca0b11c..0a7c2e82d621d 100644 --- a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "deepin-compressor"; - version = "5.12.9"; + version = "5.12.14"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-HJDtUvXUT94G4WqrK92UMmijnuC4ApkKHU3yE3rOKHQ="; + sha256 = "sha256-0F1LdoeGtIKOVepifwdNMohbEb9fakpQLiNHg5H9Nlw="; }; postPatch = '' @@ -58,6 +58,8 @@ stdenv.mkDerivation rec { "-DUSE_TEST=OFF" ]; + strictDeps = true; + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" diff --git a/pkgs/desktops/deepin/apps/deepin-draw/default.nix b/pkgs/desktops/deepin/apps/deepin-draw/default.nix index 2138d910960fb..c43cc77b51087 100644 --- a/pkgs/desktops/deepin/apps/deepin-draw/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-draw/default.nix @@ -2,25 +2,26 @@ , lib , fetchFromGitHub , fetchpatch -, dtkwidget -, qt5integration -, qt5platform-plugins , cmake , qttools , pkg-config , wrapQtAppsHook , qtbase +, qtsvg +, dtkwidget +, qt5integration +, qt5platform-plugins }: stdenv.mkDerivation rec { pname = "deepin-draw"; - version = "5.11.4"; + version = "5.11.7"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-49RQQ52HR5aqzeVEjGm9vQpTOxhY7I0X724x/Bboo90="; + sha256 = "sha256-oryh1b7/78Hp3JclN9vKvfcKRg58nsfGZQvBx6VyJBs"; }; patches = [ @@ -44,12 +45,16 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + qtbase + qtsvg dtkwidget qt5platform-plugins ]; cmakeFlags = [ "-DVERSION=${version}" ]; + strictDeps = true; + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" diff --git a/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix new file mode 100644 index 0000000000000..eaeeae9892998 --- /dev/null +++ b/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix @@ -0,0 +1,129 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, runtimeShell +, cmake +, pkg-config +, wrapQtAppsHook +, qtbase +, qttools +, qtx11extras +, qtmultimedia +, dtkwidget +, qt5integration +, qt5platform-plugins +, qtmpris +, qtdbusextended +, gsettings-qt +, elfutils +, ffmpeg +, ffmpegthumbnailer +, mpv +, xorg +, pcre +, libdvdread +, libdvdnav +, libunwind +, libva +, zstd +, glib +, gst_all_1 +, gtest +, libpulseaudio +}: + +stdenv.mkDerivation rec { + pname = "deepin-movie-reborn"; + version = "5.10.23"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-0m8wYRQGsdN4zpnHUJKCfF05SdvTauRSp6gCu2F9ZAI"; + }; + + patches = [ + (fetchpatch { + name = "chore: dont use </usr/include/linux/cdrom.h>"; + url = "https://github.com/linuxdeepin/deepin-movie-reborn/commit/2afc63541589adab8b0c8c48e290f03535ec2996.patch"; + sha256 = "sha256-Q9dv5L5sUGeuvNxF8ypQlZuZVuU4NIR/8d8EyP/Q5wk="; + }) + (fetchpatch { + name = "feat: rewrite libPath to read LD_LIBRARY_PATH"; + url = "https://github.com/linuxdeepin/deepin-movie-reborn/commit/432bf452ed244c256e99ecaf80bb6a0eef9b4a74.patch"; + sha256 = "sha256-5hRQ8D9twBKgouVpIBa1pdAGk0lI/wEdQaHBBHFCZBA"; + }) + ]; + + postPatch = '' + substituteInPlace src/widgets/toolbox_proxy.cpp \ + --replace "/bin/bash" "${runtimeShell}" + ''; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + cmake + pkg-config + qttools + wrapQtAppsHook + ]; + + buildInputs = [ + dtkwidget + qt5platform-plugins + qtx11extras + qtmultimedia + qtdbusextended + qtmpris + gsettings-qt + elfutils.dev + ffmpeg + ffmpegthumbnailer + xorg.libXtst + xorg.libXdmcp + xorg.xcbproto + pcre.dev + libdvdread + libdvdnav + libunwind + libva + zstd.dev + mpv + gtest + libpulseaudio + ] ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + ]); + + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ mpv ffmpeg ffmpegthumbnailer gst_all_1.gstreamer gst_all_1.gst-plugins-base ]}" + ]; + + env.NIX_CFLAGS_COMPILE = toString [ + "-I${gst_all_1.gstreamer.dev}/include/gstreamer-1.0" + "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0" + ]; + + cmakeFlags = [ + "-DVERSION=${version}" + ]; + + preFixup = '' + glib-compile-schemas ${glib.makeSchemaPath "$out" "${pname}-${version}"} + qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + ''; + + meta = with lib; { + description = "Full-featured video player supporting playing local and streaming media in multiple video formats"; + homepage = "https://github.com/linuxdeepin/deepin-movie-reborn"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/pkgs/desktops/deepin/apps/deepin-reader/default.nix b/pkgs/desktops/deepin/apps/deepin-reader/default.nix index f7ab5220b61c4..b72ae4b60356a 100644 --- a/pkgs/desktops/deepin/apps/deepin-reader/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-reader/default.nix @@ -16,19 +16,18 @@ , libspectre , openjpeg , djvulibre -, gtest , qtbase }: stdenv.mkDerivation rec { pname = "deepin-reader"; - version = "5.10.28"; + version = "5.10.29"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-0jHhsxEjBbu3ktvjX1eKnkZDwzRk9MrUSJSdYeOvWtI="; + sha256 = "sha256-IpgmTmnrPWc9EFZVM+S2nFxdpPjbgXqEWUnK/O9FmUg="; }; patches = [ ./use-pkg-config.diff ]; @@ -56,7 +55,10 @@ stdenv.mkDerivation rec { libspectre djvulibre openjpeg - gtest + ]; + + qmakeFlags = [ + "DEFINES+=VERSION=${version}" ]; # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 4195af30e5d73..f9bbf7df5eb73 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -42,6 +42,7 @@ let deepin-draw = callPackage ./apps/deepin-draw { }; deepin-editor = callPackage ./apps/deepin-editor { }; deepin-image-viewer = callPackage ./apps/deepin-image-viewer { }; + deepin-movie-reborn = callPackage ./apps/deepin-movie-reborn { }; deepin-music = callPackage ./apps/deepin-music { }; deepin-picker = callPackage ./apps/deepin-picker { }; deepin-terminal = callPackage ./apps/deepin-terminal { }; @@ -57,6 +58,7 @@ let deepin-desktop-schemas = callPackage ./go-package/deepin-desktop-schemas { }; #### TOOLS + dde-device-formatter = callPackage ./tools/dde-device-formatter { }; deepin-gettext-tools = callPackage ./tools/deepin-gettext-tools { }; #### ARTWORK diff --git a/pkgs/desktops/deepin/library/dtkgui/default.nix b/pkgs/desktops/deepin/library/dtkgui/default.nix index 0cc40768285a3..b408055b0c37e 100644 --- a/pkgs/desktops/deepin/library/dtkgui/default.nix +++ b/pkgs/desktops/deepin/library/dtkgui/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { buildInputs = [ lxqt.libqtxdg + librsvg + freeimage ]; propagatedBuildInputs = [ dtkcore - librsvg qtimageformats - freeimage ]; cmakeFlags = [ diff --git a/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix b/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix new file mode 100644 index 0000000000000..87a2fe1b66c79 --- /dev/null +++ b/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix @@ -0,0 +1,69 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, dtkwidget +, deepin-gettext-tools +, qt5integration +, qmake +, qtbase +, qttools +, qtx11extras +, pkg-config +, wrapQtAppsHook +, udisks2-qt5 +}: + +stdenv.mkDerivation rec { + pname = "dde-device-formatter"; + version = "unstable-2022-09-05"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = "9b8489cb2bb7c85bd62557d16a5eabc94100512e"; + sha256 = "sha256-Mi48dSDCoKhr8CGt9z64/9d7+r9QSrPPICv+R5VDuaU="; + }; + + patches = [ + (fetchpatch { + name = "chore: don't use hardcode path"; + url = "https://github.com/linuxdeepin/dde-device-formatter/commit/b836a498b8e783e0dff3820302957f15ee8416eb.patch"; + sha256 = "sha256-i/VqJ6EmCyhE6weHKUB66bW6b51gLyssIAzb5li4aJM="; + }) + ]; + + postPatch = '' + substituteInPlace dde-device-formatter.pro --replace "/usr" "$out" + patchShebangs *.sh + ''; + + nativeBuildInputs = [ + qmake + qttools + pkg-config + wrapQtAppsHook + deepin-gettext-tools + ]; + + buildInputs = [ + dtkwidget + udisks2-qt5 + qtx11extras + ]; + + cmakeFlags = [ "-DVERSION=${version}" ]; + + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + ]; + + meta = with lib; { + description = "A simple graphical interface for creating file system in a block device"; + homepage = "https://github.com/linuxdeepin/dde-device-formatter"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} |