New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
libindicator: Fix indicator path #79832
Conversation
Same thing with the commit message at #79830 (comment). |
How does this affect programs using the key for installation? |
7a51f72
to
8e96c47
Compare
@worldofpeace fixed |
Currently mate-indicator-applet doesn't find indicator-application, this commit fixes that
8e96c47
to
c0ef8f6
Compare
pkg-config actually supports installing relative to a package prefix, so a package would do $ libdir=/nix/store/my-app/lib
$ nix-shell -p pkg-config libindicator --run "pkg-config indicator3-0.4 --define-variable=libdir='$libdir' --variable indicatordir"
/nix/store/my-app/lib/indicators3/7/ See https://www.bassi.io/articles/2018/03/15/pkg-config-and-paths/ If there are such packages, they would work before but not after this patch removed |
indicator-application-gtk3 and mate-indicator-applet are working. Which may not work? |
What's needed for this to be merged? |
I do not like this method since it is inconsistent with how we use other For that reason, this should be handled in the individual consumers like |
@@ -22,6 +22,8 @@ stdenv.mkDerivation rec { | |||
postPatch = '' | |||
substituteInPlace configure \ | |||
--replace 'LIBINDICATOR_LIBS+="$LIBM"' 'LIBINDICATOR_LIBS+=" $LIBM"' | |||
substituteInPlace libindicator/indicator3-0.4.pc.in.in \ | |||
--replace 'indicatordir=''${libdir}' 'indicatordir=/run/current-system/sw/lib' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
--replace 'indicatordir=''${libdir}' 'indicatordir=/run/current-system/sw/lib'�� | |
--replace 'indicatordir=''${libdir}' 'indicatordir=/run/current-system/sw/lib' |
Motivation for this change
Currently mate-indicator-applet doesn't find indicator-application, this commit fixes that
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)