diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-21 01:19:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-21 01:19:31 +0000 |
| commit | e5fef074d63de524cb40ebc609eabe51db90d80e (patch) | |
| tree | e8fc60c5bcc0b8fef14d2923b515c52d27da714c /pkgs/misc/emulators | |
| parent | 49d7c98041f2298b79b5118d816d7215c6a49524 (diff) | |
| parent | 3617a771ca43a34e1b3a97f1bc046f7be2aac92a (diff) | |
| download | nixlib-e5fef074d63de524cb40ebc609eabe51db90d80e.tar nixlib-e5fef074d63de524cb40ebc609eabe51db90d80e.tar.gz nixlib-e5fef074d63de524cb40ebc609eabe51db90d80e.tar.bz2 nixlib-e5fef074d63de524cb40ebc609eabe51db90d80e.tar.lz nixlib-e5fef074d63de524cb40ebc609eabe51db90d80e.tar.xz nixlib-e5fef074d63de524cb40ebc609eabe51db90d80e.tar.zst nixlib-e5fef074d63de524cb40ebc609eabe51db90d80e.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/misc/emulators')
| -rw-r--r-- | pkgs/misc/emulators/mednaffe/default.nix | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/misc/emulators/mednaffe/default.nix index e8cda5170cc0..dbbbe4da5572 100644 --- a/pkgs/misc/emulators/mednaffe/default.nix +++ b/pkgs/misc/emulators/mednaffe/default.nix @@ -1,7 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, autoreconfHook, pkg-config, wrapGAppsHook -, gtk2 ? null, gtk3 ? null, mednafen }: - -with lib; +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, pkg-config +, mednafen +, gtk2 ? null +, gtk3 ? null +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "mednaffe"; @@ -14,13 +20,20 @@ stdenv.mkDerivation rec { sha256 = "15qk3a3l1phr8bap2ayh3c0vyvw2jwhny1iz1ajq2adyjpm9fhr7"; }; - nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; buildInputs = [ gtk2 gtk3 mednafen ]; - configureFlags = [ (enableFeature (gtk3 != null) "gtk3") ]; - postInstall = "wrapProgram $out/bin/mednaffe --set PATH ${mednafen}/bin"; + configureFlags = [ (lib.enableFeature (gtk3 != null) "gtk3") ]; + + dontWrapGApps = true; + + postInstall = '' + wrapProgram $out/bin/mednaffe \ + --prefix PATH ':' "${mednafen}/bin" \ + "''${gappsWrapperArgs[@]}" + ''; - meta = { + meta = with lib; { description = "GTK-based frontend for mednafen emulator"; homepage = "https://github.com/AmatCoder/mednaffe"; license = licenses.gpl3Plus; |