BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

epsxe: fix link with openssl (#71920)

Browse source 
* 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.
This commit is contained in:
Guillaume Bouchard 2019-10-25 19:51:37 +02:00 committed by Renaud
parent 50208ab5b9
commit 4a2475c924
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/misc/emulators/epsxe/default.nix
View file

@ -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 = {