diff options
| author | Bobby Rong <rjl931189261@126.com> | 2024-04-16 08:32:26 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-16 08:32:26 +0800 |
| commit | c1a9cc8fdc7afa5ed1501d54bc746b4d045983ee (patch) | |
| tree | 43a0b90493911f532fd9bbeb6f833c3426106594 | |
| parent | Merge pull request #303333 from kashw2/d2 (diff) | |
| parent | cinnamon.pix: Build without webkit2gtk-4.0 (diff) | |
| download | nixpkgs-c1a9cc8fdc7afa5ed1501d54bc746b4d045983ee.tar.gz | |
Merge pull request #304139 from bobby285271/upd/cinnamon
cinnamon.pix: Build without webkit2gtk-4.0
| -rw-r--r-- | pkgs/desktops/cinnamon/pix/default.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/desktops/cinnamon/pix/default.nix b/pkgs/desktops/cinnamon/pix/default.nix index d1272f431389..1264ca82fc8b 100644 --- a/pkgs/desktops/cinnamon/pix/default.nix +++ b/pkgs/desktops/cinnamon/pix/default.nix @@ -10,15 +10,12 @@ , libtiff , gst_all_1 , libraw -, libsoup , libsecret , glib , gtk3 , gsettings-desktop-schemas , librsvg , libwebp -, json-glib -, webkitgtk , lcms2 , bison , flex @@ -65,17 +62,14 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gtk3 - json-glib lcms2 libheif libjpeg libraw librsvg libsecret - libsoup libtiff libwebp - webkitgtk xapp ]; @@ -89,6 +83,10 @@ stdenv.mkDerivation rec { pix/make-authors-tab.py ''; + # Avoid direct dependency on webkit2gtk-4.0 + # https://fedoraproject.org/wiki/Changes/Remove_webkit2gtk-4.0_API_Version + mesonFlags = [ "-Dwebservices=false" ]; + preFixup = '' gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") ''; |