diff options
| author | Robin Gloster <mail@glob.in> | 2016-03-28 15:16:29 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-03-28 15:16:29 +0000 |
| commit | f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3 (patch) | |
| tree | 0f17999d3a5444f16f09e0c1d7f3075e0224e731 /pkgs/misc/emulators | |
| parent | 3f45f0948d6fe158bed063adb66850ded0ba4861 (diff) | |
| parent | c61445357e2a92470bee43a71a10baef1a3196e4 (diff) | |
| download | nixlib-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar nixlib-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar.gz nixlib-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar.bz2 nixlib-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar.lz nixlib-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar.xz nixlib-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.tar.zst nixlib-f60c9df0ba66767dfa64bf2fb95eb6776cafa2c3.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/misc/emulators')
| -rw-r--r-- | pkgs/misc/emulators/higan/0001-change-flags.diff | 9 | ||||
| -rw-r--r-- | pkgs/misc/emulators/mednaffe/default.nix | 28 |
2 files changed, 28 insertions, 9 deletions
diff --git a/pkgs/misc/emulators/higan/0001-change-flags.diff b/pkgs/misc/emulators/higan/0001-change-flags.diff index 78f4a248c5fd..9d7608b93281 100644 --- a/pkgs/misc/emulators/higan/0001-change-flags.diff +++ b/pkgs/misc/emulators/higan/0001-change-flags.diff @@ -11,15 +11,6 @@ diff -rupN higan_v095-source.orig/GNUmakefile higan_v095-source/GNUmakefile objects := libco # profile-guided optimization mode -@@ -43,7 +44,7 @@ ifeq ($(platform),windows) - else ifeq ($(platform),macosx) - flags += -march=native - else ifeq ($(platform),linux) -- flags += -march=native -fopenmp -+ flags += -fopenmp - link += -fopenmp - link += -Wl,-export-dynamic - link += -lX11 -lXext -ldl diff -rupN higan_v095-source.orig/icarus/GNUmakefile higan_v095-source/icarus/GNUmakefile --- higan_v095-source.orig/icarus/GNUmakefile 2015-11-04 10:28:26.186486119 +0100 +++ higan_v095-source/icarus/GNUmakefile 2015-11-04 10:28:48.755059317 +0100 diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/misc/emulators/mednaffe/default.nix new file mode 100644 index 000000000000..7777e73d3375 --- /dev/null +++ b/pkgs/misc/emulators/mednaffe/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, pkgconfig, gtk2, mednafen }: + +stdenv.mkDerivation rec { + + version = "0.8"; + name = "mednaffe-${version}"; + + src = fetchFromGitHub { + repo = "mednaffe"; + owner = "AmatCoder"; + rev = "v${version}"; + sha256 = "1j4py4ih14fa6dv0hka03rs4mq19ir83qkbxsz3695a4phmip0jr"; + }; + + prePatch = '' + substituteInPlace src/mednaffe.c --replace "binpath = NULL" "binpath = \"${mednafen}/bin/mednafen\"" + ''; + + buildInputs = [ pkgconfig gtk2 mednafen ]; + + meta = with stdenv.lib; { + description = "A GTK based frontend for mednafen"; + homepage = https://github.com/AmatCoder/mednaffe; + license = licenses.gpl3; + maintainers = [ maintainers.sheenobu ]; + platforms = platforms.linux; + }; +} |