diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-26 16:50:22 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-26 16:50:22 +0200 |
commit | 81039713fad72bcfb6d29e358866344c254096c2 (patch) | |
tree | 5150eb44e296607c43c5c7ece21249d0e39ff098 /pkgs/misc/emulators | |
parent | 21df05d1ad9ad8b3e8138138f65525d2e6324341 (diff) | |
parent | 8fbdb40ef0ce39e6605db3dfd223402636de8907 (diff) | |
download | nixlib-81039713fad72bcfb6d29e358866344c254096c2.tar nixlib-81039713fad72bcfb6d29e358866344c254096c2.tar.gz nixlib-81039713fad72bcfb6d29e358866344c254096c2.tar.bz2 nixlib-81039713fad72bcfb6d29e358866344c254096c2.tar.lz nixlib-81039713fad72bcfb6d29e358866344c254096c2.tar.xz nixlib-81039713fad72bcfb6d29e358866344c254096c2.tar.zst nixlib-81039713fad72bcfb6d29e358866344c254096c2.zip |
Merge branch 'master' into staging
... to get the systemd update (rebuilding ~7k jobs).
Diffstat (limited to 'pkgs/misc/emulators')
-rw-r--r-- | pkgs/misc/emulators/mednaffe/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/misc/emulators/mednaffe/default.nix index 7777e73d3375..21e75a72d61c 100644 --- a/pkgs/misc/emulators/mednaffe/default.nix +++ b/pkgs/misc/emulators/mednaffe/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; prePatch = '' - substituteInPlace src/mednaffe.c --replace "binpath = NULL" "binpath = \"${mednafen}/bin/mednafen\"" + substituteInPlace src/mednaffe.c --replace "binpath = NULL" "binpath = g_strdup( \"${mednafen}/bin/mednafen\" )" ''; buildInputs = [ pkgconfig gtk2 mednafen ]; |