Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2eaeea7983d9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3a60adc9f83c
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 22, 2021

  1. grafana-agent: fix rpath 

    The library is in the `lib` output, not `dev` output.

(cherry picked from commit 28f04af)
    @flokli
    flokli committed Jan 22, 2021
    Copy the full SHA
    3a60adc View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/servers/monitoring/grafana-agent/default.nix
2 changes: 1 addition & 1 deletion pkgs/servers/monitoring/grafana-agent/default.nix
View file
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ buildGoModule rec {
# Add to RUNPATH so it can be found.
postFixup = ''
patchelf \
--set-rpath "${lib.makeLibraryPath [ (lib.getDev systemd) ]}:$(patchelf --print-rpath $out/bin/agent)" \
--set-rpath "${lib.makeLibraryPath [ (lib.getLib systemd) ]}:$(patchelf --print-rpath $out/bin/agent)" \
$out/bin/agent
'';