diff options
| author | Robin Gloster <mail@glob.in> | 2016-06-10 09:27:04 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-06-10 09:27:04 +0000 |
| commit | 8031cba2ab3146977141fc504bea2a1e03b5c126 (patch) | |
| tree | 0cd68c0007851dfed7d7f8247754b5c4b356704e /pkgs/applications/misc/ipmiview/default.nix | |
| parent | 2a5e64b69c83592caf900cb0b7213235e96368de (diff) | |
| parent | 656c48f141be5886c515a1a874a47472cbbac6bd (diff) | |
| download | nixpkgs-8031cba2ab3146977141fc504bea2a1e03b5c126.tar nixpkgs-8031cba2ab3146977141fc504bea2a1e03b5c126.tar.gz nixpkgs-8031cba2ab3146977141fc504bea2a1e03b5c126.tar.bz2 nixpkgs-8031cba2ab3146977141fc504bea2a1e03b5c126.tar.lz nixpkgs-8031cba2ab3146977141fc504bea2a1e03b5c126.tar.xz nixpkgs-8031cba2ab3146977141fc504bea2a1e03b5c126.tar.zst nixpkgs-8031cba2ab3146977141fc504bea2a1e03b5c126.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/applications/misc/ipmiview/default.nix')
| -rw-r--r-- | pkgs/applications/misc/ipmiview/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index 6a111d48cee..0afcbca4979 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { buildInputs = [ patchelf makeWrapper ]; buildPhase = with xorg; '' - patchelf --set-rpath "${libX11}/lib:${libXext}/lib:${libXrender}/lib:${libXtst}/lib:${libXi}/lib" ./jre/lib/amd64/xawt/libmawt.so + patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/xawt/libmawt.so patchelf --set-rpath "${gcc.cc}/lib" ./libiKVM64.so - patchelf --set-rpath "${libXcursor}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${libXtst}/lib:${libXi}/lib" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/javaws + patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libXcursor libX11 libXext libXrender libXtst libXi ]}" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/javaws patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java ''; |