diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-01-03 03:22:40 +0100 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-01-03 03:22:40 +0100 |
| commit | eb5334c27dd959fa4e65bb9c9b5a3c78b4d37ffb (patch) | |
| tree | 1e0c4d6947e2e82cdc876f775ba7c74c8ab2f077 /pkgs/desktops | |
| parent | 0c6502e9830a7bf25258731316dd3c72fb08f94c (diff) | |
| parent | d42bc1bafe74397063f84d819c17de48326c7c8d (diff) | |
| download | nixlib-eb5334c27dd959fa4e65bb9c9b5a3c78b4d37ffb.tar nixlib-eb5334c27dd959fa4e65bb9c9b5a3c78b4d37ffb.tar.gz nixlib-eb5334c27dd959fa4e65bb9c9b5a3c78b4d37ffb.tar.bz2 nixlib-eb5334c27dd959fa4e65bb9c9b5a3c78b4d37ffb.tar.lz nixlib-eb5334c27dd959fa4e65bb9c9b5a3c78b4d37ffb.tar.xz nixlib-eb5334c27dd959fa4e65bb9c9b5a3c78b4d37ffb.tar.zst nixlib-eb5334c27dd959fa4e65bb9c9b5a3c78b4d37ffb.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/deepin/core/dde-appearance/fix-custom-wallpapers-path.diff | 4 | ||||
| -rw-r--r-- | pkgs/desktops/lomiri/development/cmake-extras/default.nix | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/desktops/deepin/core/dde-appearance/fix-custom-wallpapers-path.diff b/pkgs/desktops/deepin/core/dde-appearance/fix-custom-wallpapers-path.diff index b9ef2aaafc23..14fb527c7ef4 100644 --- a/pkgs/desktops/deepin/core/dde-appearance/fix-custom-wallpapers-path.diff +++ b/pkgs/desktops/deepin/core/dde-appearance/fix-custom-wallpapers-path.diff @@ -49,7 +49,7 @@ index 360ca6f..6db93ab 100644 wallpaper = bg.getId(); } else { - wallpaper = "file:///usr/share/wallpapers/deepin/desktop.jpg"; -+ wallpaper = "file:///run/current-system/sw/wallpapers/deepin/desktop.jpg"; ++ wallpaper = "file:///run/current-system/sw/share/wallpapers/deepin/desktop.jpg"; } PhaseWallPaper::setWallpaperUri(index, monitorName, wallpaper); @@ -62,7 +62,7 @@ index bf739a5..1076d59 100644 #include <QDBusReply> -QStringList Backgrounds::systemWallpapersDir = { "/usr/share/wallpapers/deepin" }; -+QStringList Backgrounds::systemWallpapersDir = { "/run/current-system/sw/wallpapers/deepin" }; ++QStringList Backgrounds::systemWallpapersDir = { "/run/current-system/sw/share/wallpapers/deepin" }; QStringList Backgrounds::uiSupportedFormats = { "jpeg", "png", "bmp", "tiff", "gif" }; Backgrounds::Backgrounds(QObject *parent) diff --git a/pkgs/desktops/lomiri/development/cmake-extras/default.nix b/pkgs/desktops/lomiri/development/cmake-extras/default.nix index ee5665cd668f..fcad286f4daf 100644 --- a/pkgs/desktops/lomiri/development/cmake-extras/default.nix +++ b/pkgs/desktops/lomiri/development/cmake-extras/default.nix @@ -5,21 +5,21 @@ , qtbase }: -stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "cmake-extras"; - version = "unstable-2022-11-21"; + version = "1.7"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/cmake-extras"; - rev = "99aab4514ee182cb7a94821b4b51e4d8cb9a82ef"; - hash = "sha256-axj5QxgDrHy0HiZkfrbm22hVvSCKkWFoQC8MdQMm9tg="; + rev = finalAttrs.version; + hash = "sha256-5bLMk21pSZkuU3jAGTnjPc9ZrvVZqMUWSfFgkTtkYLw="; }; postPatch = '' # We have nothing to build here, no need to depend on a C compiler substituteInPlace CMakeLists.txt \ - --replace 'project(cmake-extras)' 'project(cmake-extras NONE)' + --replace 'project(cmake-extras' 'project(cmake-extras LANGUAGES NONE' # This is in a function that reverse dependencies use to determine where to install their files to substituteInPlace src/QmlPlugins/QmlPluginsConfig.cmake \ @@ -46,4 +46,4 @@ stdenvNoCC.mkDerivation { maintainers = teams.lomiri.members; platforms = platforms.all; }; -} +}) |