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: 4ec3d311cb02
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1e066db4b8d9
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 26, 2017

  1. epsxe: fix install, 32-bit executable uses mixed case

    @lukateras
    lukateras committed Sep 26, 2017
    Copy the full SHA
    c3e6e9b View commit details

  2. Merge pull request #29816 from yegortimoshenko/epsxe/fix-install 

    epsxe: fix install, 32-bit executable uses mixed case
    @Mic92
    Mic92 authored Sep 26, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    Zuoqiu-Yingyi Yingyi / 颖逸
    GPG key ID: 833DAD5428FF18A8
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1e066db View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/misc/emulators/epsxe/default.nix
2 changes: 1 addition & 1 deletion pkgs/misc/emulators/epsxe/default.nix
View file
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
dontStrip = true;

installPhase = ''
install -D epsxe${optionalString stdenv.is64bit "_x64"} $out/bin/epsxe
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} \