diff options
Diffstat (limited to 'pkgs/desktops')
5 files changed, 51 insertions, 32 deletions
diff --git a/pkgs/desktops/deepin/apps/deepin-camera/default.nix b/pkgs/desktops/deepin/apps/deepin-camera/default.nix index e55640cbd094c..f1b4485354baf 100644 --- a/pkgs/desktops/deepin/apps/deepin-camera/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-camera/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "deepin-camera"; - version = "1.4.13"; + version = "6.0.2"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-h4oCxtj9GwaZqioZ4vFx2Cq8a1w7lYQvOhDAd7x9gMU="; + hash = "sha256-GQQFwlJNfdsi0GvDRMIorUnlbXrgbYl9H9aBedOm+ZQ="; }; # QLibrary and dlopen work with LD_LIBRARY_PATH @@ -66,7 +66,6 @@ stdenv.mkDerivation rec { gstreamer gst-plugins-base gst-plugins-good - gst-plugins-bad ]); cmakeFlags = [ "-DVERSION=${version}" ]; diff --git a/pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff b/pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff index b4ef86f79b38a..f8e005f577a31 100644 --- a/pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff +++ b/pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff @@ -1,25 +1,24 @@ +diff --git a/src/src/gstvideowriter.cpp b/src/src/gstvideowriter.cpp +index c96c8b0..fcc11da 100644 +--- a/src/src/gstvideowriter.cpp ++++ b/src/src/gstvideowriter.cpp +@@ -282,6 +282,7 @@ void GstVideoWriter::loadAppSrcCaps() + + QString GstVideoWriter::libPath(const QString &strlib) + { ++ return strlib; + QDir dir; + QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); + dir.setPath(path); diff --git a/src/src/mainwindow.cpp b/src/src/mainwindow.cpp -index d3c6f5c..4817446 100644 +index d3c6c24..6d313a6 100644 --- a/src/src/mainwindow.cpp +++ b/src/src/mainwindow.cpp -@@ -781,19 +781,7 @@ void CMainWindow::slotPopupSettingsDialog() +@@ -784,6 +784,7 @@ void CMainWindow::slotPopupSettingsDialog() QString CMainWindow::libPath(const QString &strlib) { -- QDir dir; -- QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); -- dir.setPath(path); -- QStringList list = dir.entryList(QStringList() << (strlib + "*"), QDir::NoDotAndDotDot | QDir::Files); //filter name with strlib -- -- if (list.contains(strlib)) -- return strlib; -- -- list.sort(); -- if (list.size() > 0) -- return list.last(); -- -- return ""; + return strlib; - } - - void CMainWindow::reflushSnapshotLabel() + QDir dir; + QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); + dir.setPath(path); diff --git a/pkgs/desktops/deepin/apps/deepin-music/default.nix b/pkgs/desktops/deepin/apps/deepin-music/default.nix index fe39459ec046e..914e4e6671dc4 100644 --- a/pkgs/desktops/deepin/apps/deepin-music/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-music/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "deepin-music"; - version = "6.2.28"; + version = "6.2.31"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-rSaB8kIbpyPuhw3vWLWlXgY6xJpxLL8DktgcBoca0L0="; + hash = "sha256-OXyHB47orv9ix+Jg0b7wciA6DWUsXzFmIg4SM+piO3c="; }; postPatch = '' diff --git a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix index 74b9e8797db94..5271fd6c043db 100644 --- a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix @@ -1,17 +1,38 @@ -{ lib, mkXfceDerivation, gtk3, libxfce4ui, vte, xfconf, pcre2, libxslt, docbook_xml_dtd_45, docbook_xsl, nixosTests }: +{ lib +, mkXfceDerivation +, glib +, gtk3 +, libxfce4ui +, vte +, xfconf +, pcre2 +, libxslt +, docbook_xml_dtd_45 +, docbook_xsl +, nixosTests +}: mkXfceDerivation { category = "apps"; pname = "xfce4-terminal"; - version = "1.0.4"; + version = "1.1.0"; - sha256 = "sha256-eCb6KB9fFPuYzNLUm/yYrh+0D60ISzasnv/myStImEI="; + sha256 = "sha256-ilxiP1Org5/uSQOzfRgODmouH0BmK3CmCJj1kutNuII="; - nativeBuildInputs = [ libxslt docbook_xml_dtd_45 docbook_xsl ]; + nativeBuildInputs = [ + libxslt + docbook_xml_dtd_45 + docbook_xsl + ]; - buildInputs = [ gtk3 libxfce4ui vte xfconf pcre2 ]; - - env.NIX_CFLAGS_COMPILE = "-I${libxfce4ui.dev}/include/xfce4"; + buildInputs = [ + glib + gtk3 + libxfce4ui + vte + xfconf + pcre2 + ]; passthru.tests.test = nixosTests.terminal-emulators.xfce4-terminal; diff --git a/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix b/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix index b479a574d97b9..e716fab959a0d 100644 --- a/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-appfinder"; - version = "4.18.0"; + version = "4.18.1"; - sha256 = "sha256-/VYZpWk08OQPZ/DQ5SqSL4F4KDdh+IieQBDOZUxZvtw="; + sha256 = "sha256-CZEX1PzFsVt72Fkb4+5PiZjAcDisvYnbzFGFXjFL4sc="; nativeBuildInputs = [ exo ]; buildInputs = [ garcon gtk3 libxfce4ui libxfce4util xfconf ]; |