nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 01:13:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

higan: 104 -> 105

Browse Source
This commit is contained in:
AndersonTorres 2017-10-17 06:02:40 -02:00
parent e935fbf43f
commit ef198c93a8
2 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkgs/misc/emulators/higan/0001-change-flags.diff
View File

@ -1,23 +1,26 @@
diff -rupN higan_v097-source.old/higan/GNUmakefile higan_v097-source/higan/GNUmakefile
--- higan_v097-source.old/higan/GNUmakefile 2016-01-24 09:21:45.822940200 +0100
+++ higan_v097-source/higan/GNUmakefile 2016-01-24 09:24:03.028722500 +0100
@@ -36,7 +36,7 @@ ifeq ($(platform),windows)
else ifeq ($(platform),macosx)
flags += -march=native
else ifneq ($(filter $(platform),linux bsd),)
- flags += -march=native -fopenmp
+ flags += -fopenmp
diff -Naur higan_v105-source.old/higan/GNUmakefile higan_v105-source.new/higan/GNUmakefile
--- higan_v105-source.old/higan/GNUmakefile 2017-10-07 01:34:22.000000000 -0300
+++ higan_v105-source.new/higan/GNUmakefile 2017-10-17 00:02:40.580957396 -0200
@@ -26,7 +26,7 @@
flags += -fopenmp
link += -fopenmp
link += -Wl,-export-dynamic
link += -lX11 -lXext
diff -rupN higan_v097-source.old/nall/GNUmakefile higan_v097-source/nall/GNUmakefile
--- higan_v097-source.old/nall/GNUmakefile 2016-01-24 09:21:46.021749600 +0100
+++ higan_v097-source/nall/GNUmakefile 2016-01-24 09:25:06.347100800 +0100
@@ -40,8 +40,8 @@ cflags := -x c -std=c99
objcflags := -x objective-c -std=c99
ifeq ($(binary),application)
- flags += -march=native
+ flags +=
link += -Wl,-export-dynamic
link += -lX11 -lXext
else ifeq ($(binary),library)
diff -Naur higan_v105-source.old/nall/GNUmakefile higan_v105-source.new/nall/GNUmakefile
--- higan_v105-source.old/nall/GNUmakefile 2017-09-23 18:34:22.000000000 -0300
+++ higan_v105-source.new/nall/GNUmakefile 2017-10-17 00:03:33.568916550 -0200
@@ -40,8 +40,8 @@
objcflags := -x objective-c -std=c11
cppflags := -x c++ -std=c++14
objcppflags := -x objective-c++ -std=c++14
-flags :=
-link :=
+flags := $(CXXFLAGS)
+link := $(LDFLAGS)
# compiler detection
ifeq ($(compiler),)

9
pkgs/misc/emulators/higan/default.nix
View File

@ -10,12 +10,12 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "higan-${version}";
version = "104";
version = "105";
sourceName = "higan_v${version}-source";
src = fetchurl {
urls = [ "http://download.byuu.org/${sourceName}.7z" ];
sha256 = "0i2ma8zjjxadq4368n4m41vhmrb62na6s7pi219ajdsb96x0091l";
sha256 = "1lpj345vlnwcywhzq1fzxwl08zc2x4d103rgyyp7yw8m0f8f9sdl";
curlOpts = "--user-agent 'Mozilla/5.0'"; # the good old user-agent trick...
};
@ -81,8 +81,3 @@ stdenv.mkDerivation rec {
platforms = with platforms; unix;
};
}
#
# TODO:
# - fix the BML and BIOS paths - maybe submitting
# a custom patch to upstream would not be a bad idea...