diff options
Diffstat (limited to 'nixpkgs/pkgs/desktops/deepin')
4 files changed, 12 insertions, 22 deletions
diff --git a/nixpkgs/pkgs/desktops/deepin/apps/deepin-compressor/default.nix b/nixpkgs/pkgs/desktops/deepin/apps/deepin-compressor/default.nix index 55c1f4d4f293..ae628827a2b6 100644 --- a/nixpkgs/pkgs/desktops/deepin/apps/deepin-compressor/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/apps/deepin-compressor/default.nix @@ -14,18 +14,19 @@ , wrapQtAppsHook , minizip , libzip +, libuuid , libarchive }: stdenv.mkDerivation rec { pname = "deepin-compressor"; - version = "5.12.15"; + version = "5.12.17"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-6grnbv9hMKntOmpVcmU5IpAbHM7r0dQWb+SoQYtc5YY="; + hash = "sha256-eg9JcuBTKoaEuoph0rvy0VRH28sFOdYWN9sGbduUwcM="; }; postPatch = '' @@ -51,6 +52,7 @@ stdenv.mkDerivation rec { karchive minizip libzip + libuuid libarchive ]; diff --git a/nixpkgs/pkgs/desktops/deepin/apps/deepin-terminal/default.nix b/nixpkgs/pkgs/desktops/deepin/apps/deepin-terminal/default.nix index 5caa37bfeadd..1aa9ffdf0855 100644 --- a/nixpkgs/pkgs/desktops/deepin/apps/deepin-terminal/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/apps/deepin-terminal/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "deepin-terminal"; - version = "6.0.5"; + version = "6.0.6"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-pRTdvR3hyiJVpi38Ex58X74ns+rSWuytsOXemvdW1Rk="; + hash = "sha256-LzCbh+BErgh7Ojbw314oHB8QvyS6UeJkDUkNngzVm+A="; }; cmakeFlags = [ "-DVERSION=${version}" ]; diff --git a/nixpkgs/pkgs/desktops/deepin/go-package/go-gir-generator/default.nix b/nixpkgs/pkgs/desktops/deepin/go-package/go-gir-generator/default.nix index 7f377d2a6e74..eecdbeb990ba 100644 --- a/nixpkgs/pkgs/desktops/deepin/go-package/go-gir-generator/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/go-package/go-gir-generator/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config go + gobject-introspection ]; buildInputs = [ libgudev - gobject-introspection ]; makeFlags = [ diff --git a/nixpkgs/pkgs/desktops/deepin/library/image-editor/default.nix b/nixpkgs/pkgs/desktops/deepin/library/image-editor/default.nix index 6133d38aff22..005474c19694 100644 --- a/nixpkgs/pkgs/desktops/deepin/library/image-editor/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/library/image-editor/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , dtkwidget , cmake , qttools @@ -16,28 +15,15 @@ stdenv.mkDerivation rec { pname = "image-editor"; - version = "1.0.24"; + version = "1.0.32"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-0p/aicuBfaEyvfZomnz49IJLospWIdl23ZreDe+Bzqc="; + hash = "sha256-mA2pqWXa3i19jCymvUXnG6YUVezDSfRkHx2EoxAhnqU="; }; - patches = [ - (fetchpatch { - name = "feat_check_PREFIX_value_before_set.patch"; - url = "https://github.com/linuxdeepin/image-editor/commit/dae86e848cf53ba0ece879d81e8d5335d61a7473.patch"; - sha256 = "sha256-lxmR+nIrMWVyhl1jpA17x2yqJ40h5vnpqKKcjd8j9RY="; - }) - (fetchpatch { - name = "feat_use_FULL_install_path.patch"; - url = "https://github.com/linuxdeepin/image-editor/commit/855ae53a0444ac628aa0fe893932df6263b82e2e.patch"; - sha256 = "sha256-3Dynlwl/l/b6k6hOHjTdoDQ/VGBDfyRz9b8QY8FEsCc="; - }) - ]; - postPatch = '' substituteInPlace libimageviewer/service/ffmpegvideothumbnailer.cpp \ --replace 'libPath("libffmpegthumbnailer.so")' 'QString("${ffmpegthumbnailer.out}/lib/libffmpegthumbnailer.so")' @@ -57,7 +43,9 @@ stdenv.mkDerivation rec { pcre ]; - cmakeFlags = [ "-DVERSION=${version}" ]; + cmakeFlags = [ + "-DCMAKE_INSTALL_LIBDIR=lib" + ]; meta = with lib; { description = "Image editor lib for dtk"; |