alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

cinnamon.xapp: actually fix gtk3 module target dir

Browse source 
Before: $out/gtk-3.0/modules/libxapp-gtk3-module.so
After: $out/lib/gtk-3.0/modules/libxapp-gtk3-module.so

cat gtk+-3.0.pc | grep "libdir=" says `libdir=${prefix}/lib`, so install this there.

Another package that installs gtk3 module: libcanberra-gtk3
This commit is contained in:
Bobby Rong 2023-06-08 19:33:53 +08:00
parent 1e8e84a59f
commit 64aa3024b5
No known key found for this signature in database
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/desktops/cinnamon/xapp/default.nix
View file

@ -79,12 +79,11 @@ stdenv.mkDerivation rec {
# Patch pastebin & inxi location # Patch pastebin & inxi location
sed "s|/usr/bin/pastebin|$out/bin/pastebin|" -i scripts/upload-system-info sed "s|/usr/bin/pastebin|$out/bin/pastebin|" -i scripts/upload-system-info
sed "s|'inxi'|'${inxi}/bin/inxi'|" -i scripts/upload-system-info sed "s|'inxi'|'${inxi}/bin/inxi'|" -i scripts/upload-system-info
# Patch gtk3 module target dir
substituteInPlace libxapp/meson.build \
--replace "gtk3_dep.get_pkgconfig_variable('libdir')" "'$out'"
''; '';
# Fix gtk3 module target dir. Proper upstream solution should be using define_variable.
PKG_CONFIG_GTK__3_0_LIBDIR = "${placeholder "out"}/lib";
meta = with lib; { meta = with lib; {
homepage = "https://github.com/linuxmint/xapp"; homepage = "https://github.com/linuxmint/xapp";
description = "Cross-desktop libraries and common resources"; description = "Cross-desktop libraries and common resources";