diff options
| author | Guillaume Bouchard <guillaume.bouchard@tweag.io> | 2019-10-25 19:51:37 +0200 |
|---|---|---|
| committer | Renaud <c0bw3b@users.noreply.github.com> | 2019-10-25 19:51:37 +0200 |
| commit | 4a2475c924bfb059abf1db96547e7b390a3f07ca (patch) | |
| tree | d1817143a138c8014d42b3f7c0484e114e86cf17 /pkgs/misc/emulators | |
| parent | 50208ab5b93e6d1965920b07544dd7871233e6f4 (diff) | |
| download | nixpkgs-4a2475c924bfb059abf1db96547e7b390a3f07ca.tar nixpkgs-4a2475c924bfb059abf1db96547e7b390a3f07ca.tar.gz nixpkgs-4a2475c924bfb059abf1db96547e7b390a3f07ca.tar.bz2 nixpkgs-4a2475c924bfb059abf1db96547e7b390a3f07ca.tar.lz nixpkgs-4a2475c924bfb059abf1db96547e7b390a3f07ca.tar.xz nixpkgs-4a2475c924bfb059abf1db96547e7b390a3f07ca.tar.zst nixpkgs-4a2475c924bfb059abf1db96547e7b390a3f07ca.zip | |
epsxe: fix link with openssl (#71920)
* epsxe: fix link with openssl Epsxe is hardcoded to build with openssl-1.0 (using libcrypto.so.1.0.0), but current nixpkgs contains openssl-1.1, which provides libcrypto.so.1.1. This patchs just uses the previous version of the library. * epsxe: use autoPatchelfHook instead of manual rpath overriding This simplifies the file AND generates failures at build time if a needed dynamic library is not found during build time.
Diffstat (limited to 'pkgs/misc/emulators')
| -rw-r--r-- | pkgs/misc/emulators/epsxe/default.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/misc/emulators/epsxe/default.nix index b9923def6f2..1cfa0db790f 100644 --- a/pkgs/misc/emulators/epsxe/default.nix +++ b/pkgs/misc/emulators/epsxe/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, alsaLib, curl, gdk-pixbuf, glib, gtk3, libGLU_combined, - libX11, openssl, ncurses5, SDL, SDL_ttf, unzip, zlib, wrapGAppsHook }: + libX11, openssl_1_0_2, ncurses5, SDL, SDL_ttf, unzip, zlib, wrapGAppsHook, autoPatchelfHook }: with stdenv.lib; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { else "1677lclam557kp8jwvchdrk27zfj50fqx2q9i3bcx26d9k61q3kl"; }; - nativeBuildInputs = [ unzip wrapGAppsHook ]; + nativeBuildInputs = [ unzip wrapGAppsHook autoPatchelfHook ]; sourceRoot = "."; buildInputs = [ @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { gtk3 libX11 libGLU_combined - openssl + openssl_1_0_2 ncurses5 SDL SDL_ttf @@ -40,10 +40,6 @@ stdenv.mkDerivation rec { installPhase = '' install -D ${if stdenv.is64bit then "epsxe_x64" else "ePSXe"} $out/bin/epsxe - patchelf \ - --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ - --set-rpath ${makeLibraryPath buildInputs} \ - $out/bin/epsxe ''; meta = { |