colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #304139 from bobby285271/upd/cinnamon

Browse Source 
cinnamon.pix: Build without webkit2gtk-4.0
This commit is contained in:
Bobby Rong 2024-04-16 08:32:26 +08:00 committed by GitHub
commit c1a9cc8fdc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/desktops/cinnamon/pix/default.nix
View File

@ -10,15 +10,12 @@
, libtiff , libtiff
, gst_all_1 , gst_all_1
, libraw , libraw
, libsoup
, libsecret , libsecret
, glib , glib
, gtk3 , gtk3
, gsettings-desktop-schemas , gsettings-desktop-schemas
, librsvg , librsvg
, libwebp , libwebp
, json-glib
, webkitgtk
, lcms2 , lcms2
, bison , bison
, flex , flex
@ -65,17 +62,14 @@ stdenv.mkDerivation rec {
gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-ugly gst_all_1.gst-plugins-ugly
gtk3 gtk3
json-glib
lcms2 lcms2
libheif libheif
libjpeg libjpeg
libraw libraw
librsvg librsvg
libsecret libsecret
libsoup
libtiff libtiff
libwebp libwebp
webkitgtk
xapp xapp
]; ];
@ -89,6 +83,10 @@ stdenv.mkDerivation rec {
pix/make-authors-tab.py 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 = '' preFixup = ''
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share")
''; '';