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

Commits on Jan 20, 2021

  1. mednaffe: small fixup 

    A fixup to the ubiquitous problem of "GTK variables not found". Now the app
doesn't segfault when opening a window.
    @AndersonTorres
    AndersonTorres committed Jan 20, 2021
    Copy the full SHA
    54a4477 View commit details

  2. Merge pull request #110165 from AndersonTorres/mednafen 

    mednaffe: small wrapper fixup
    @AndersonTorres
    AndersonTorres authored Jan 20, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    610f0eb View commit details
Showing with 21 additions and 8 deletions.
  1. +21 −8 pkgs/misc/emulators/mednaffe/default.nix
29 changes: 21 additions & 8 deletions pkgs/misc/emulators/mednaffe/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;