otfcc: fix aarch64 compatibility
This commit is contained in:
parent
b9bf9c9236
commit
a10a9a77b7
|
@ -13,16 +13,16 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [ premake5 ];
|
nativeBuildInputs = [ premake5 ];
|
||||||
|
|
||||||
# Don’t guess where our makefiles will end up. Just use current
|
patches = [
|
||||||
# directory.
|
./fix-aarch64.patch
|
||||||
patchPhase = ''
|
./move-makefiles.patch
|
||||||
substituteInPlace premake5.lua \
|
];
|
||||||
--replace 'location "build/gmake"' 'location "."'
|
|
||||||
'';
|
buildFlags = stdenv.lib.optional stdenv.isAarch64 [ "config=release_arm" ];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
cp bin/release-x*/otfcc* $out/bin/
|
cp bin/release-*/otfcc* $out/bin/
|
||||||
'';
|
'';
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||||
description = "Optimized OpenType builder and inspector";
|
description = "Optimized OpenType builder and inspector";
|
||||||
homepage = "https://github.com/caryll/otfcc";
|
homepage = "https://github.com/caryll/otfcc";
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
|
platforms = [ "aarch64-linux" "i686-linux" "x86_64-linux" "x86_64-darwin" ];
|
||||||
maintainers = with maintainers; [ jfrankenau ttuegel ];
|
maintainers = with maintainers; [ jfrankenau ttuegel ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
22
pkgs/tools/misc/otfcc/fix-aarch64.patch
Normal file
22
pkgs/tools/misc/otfcc/fix-aarch64.patch
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
diff --git a/premake5.lua b/premake5.lua
|
||||||
|
index 997fd79..54a20a0 100644
|
||||||
|
--- a/premake5.lua
|
||||||
|
+++ b/premake5.lua
|
||||||
|
@@ -49,7 +49,7 @@ end
|
||||||
|
workspace "otfcc"
|
||||||
|
configurations { "release", "debug" }
|
||||||
|
|
||||||
|
- platforms { "x64", "x86" }
|
||||||
|
+ platforms { "x64", "x86", "arm" }
|
||||||
|
filter "action:xcode4"
|
||||||
|
platforms { "x64" }
|
||||||
|
filter {}
|
||||||
|
@@ -67,6 +67,8 @@ workspace "otfcc"
|
||||||
|
architecture "x86"
|
||||||
|
filter "platforms:x64"
|
||||||
|
architecture "x64"
|
||||||
|
+ filter "platforms:arm"
|
||||||
|
+ architecture "arm"
|
||||||
|
filter {}
|
||||||
|
|
||||||
|
filter "action:vs2017"
|
13
pkgs/tools/misc/otfcc/move-makefiles.patch
Normal file
13
pkgs/tools/misc/otfcc/move-makefiles.patch
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
diff --git a/premake5.lua b/premake5.lua
|
||||||
|
index 997fd79..54a20a0 100644
|
||||||
|
--- a/premake5.lua
|
||||||
|
+++ b/premake5.lua
|
||||||
|
@@ -88,7 +90,7 @@ workspace "otfcc"
|
||||||
|
flags { "StaticRuntime" }
|
||||||
|
includedirs { "dep/polyfill-msvc" }
|
||||||
|
filter "action:gmake"
|
||||||
|
- location "build/gmake"
|
||||||
|
+ location "."
|
||||||
|
filter "action:xcode4"
|
||||||
|
location "build/xcode"
|
||||||
|
filter {}
|
Loading…
Reference in a new issue