diff options
| author | Ricardo Ardissone <ricardo.ardissone@gmail.com> | 2017-03-04 08:36:06 -0300 |
|---|---|---|
| committer | Ricardo Ardissone <ricardo.ardissone@gmail.com> | 2017-03-04 08:36:06 -0300 |
| commit | 92d8680785d4de6dbc003bae36bae0bf03f11f2b (patch) | |
| tree | 51eb09b1e3962d980050a56cc6c9bc4dbf02099c /pkgs/misc | |
| parent | 4450327c062a41f7df2f6756057df4ebb6548011 (diff) | |
| download | nixpkgs-92d8680785d4de6dbc003bae36bae0bf03f11f2b.tar nixpkgs-92d8680785d4de6dbc003bae36bae0bf03f11f2b.tar.gz nixpkgs-92d8680785d4de6dbc003bae36bae0bf03f11f2b.tar.bz2 nixpkgs-92d8680785d4de6dbc003bae36bae0bf03f11f2b.tar.lz nixpkgs-92d8680785d4de6dbc003bae36bae0bf03f11f2b.tar.xz nixpkgs-92d8680785d4de6dbc003bae36bae0bf03f11f2b.tar.zst nixpkgs-92d8680785d4de6dbc003bae36bae0bf03f11f2b.zip | |
pcsxr: remove name conflict with zlib 1.2.9
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/emulators/pcsxr/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/emulators/pcsxr/uncompress2.patch | 20 |
2 files changed, 22 insertions, 0 deletions
diff --git a/pkgs/misc/emulators/pcsxr/default.nix b/pkgs/misc/emulators/pcsxr/default.nix index 74b9932ed83..bb6997dfb96 100644 --- a/pkgs/misc/emulators/pcsxr/default.nix +++ b/pkgs/misc/emulators/pcsxr/default.nix @@ -45,6 +45,8 @@ stdenv.mkDerivation rec { url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/08_reproducible.patch?h=debian/1.9.94-2"; sha256 = "1cx9q59drsk9h6l31097lg4aanaj93ysdz5p88pg9c7wvxk1qz06"; }) + + ./uncompress2.patch ]; buildInputs = [ diff --git a/pkgs/misc/emulators/pcsxr/uncompress2.patch b/pkgs/misc/emulators/pcsxr/uncompress2.patch new file mode 100644 index 00000000000..356868ce7a8 --- /dev/null +++ b/pkgs/misc/emulators/pcsxr/uncompress2.patch @@ -0,0 +1,20 @@ +--- a/libpcsxcore/cdriso.c ++++ b/libpcsxcore/cdriso.c +@@ -1219,7 +1219,7 @@ + return ret; + } + +-static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size) ++static int uncompress3(void *out, unsigned long *out_size, void *in, unsigned long in_size) + { + static z_stream z; + int ret = 0; +@@ -1298,7 +1298,7 @@ + if (is_compressed) { + cdbuffer_size_expect = sizeof(compr_img->buff_raw[0]) << compr_img->block_shift; + cdbuffer_size = cdbuffer_size_expect; +- ret = uncompress2(compr_img->buff_raw[0], &cdbuffer_size, compr_img->buff_compressed, size); ++ ret = uncompress3(compr_img->buff_raw[0], &cdbuffer_size, compr_img->buff_compressed, size); + if (ret != 0) { + SysPrintf("uncompress failed with %d for block %d, sector %d\n", + ret, block, sector); |