Merge pull request #209920 from wegank/tjcc-darwin

teyjus: 2.1 -> unstable-2019-07-26
This commit is contained in:
Nick Cao 2023-01-14 11:43:46 +08:00 committed by GitHub
commit b0557e9d97
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 11 deletions

View file

@ -2,21 +2,32 @@
stdenv.mkDerivation rec {
pname = "teyjus";
version = "2.1";
version = "unstable-2019-07-26";
src = fetchFromGitHub {
owner = "teyjus";
repo = "teyjus";
rev = "v${version}";
sha256 = "sha256-nz7jZ+GdF6mZQPzBrVD9K/RtoeuVRuhfs7vej4zDkhg=";
rev = "e63f40aa9f1d0ea5e7bac41aae5e479c3616545c";
sha256 = "sha256-gaAWKd5/DZrIPaaQzx9l0KtCMW9LPw17vvNPsnopZA0=";
};
patches = [ ./fix-lex-to-flex.patch ];
patches = [
./fix-lex-to-flex.patch
];
buildInputs = [ omake ocaml flex bison ];
postPatch = ''
sed -i "/TST/d" source/OMakefile
rm -rf source/front/caml
'';
strictDeps = true;
nativeBuildInputs = [ omake ocaml flex bison ];
hardeningDisable = [ "format" ];
NIX_CFLAGS_COMPILE = "-I${ocaml}/include";
buildPhase = "omake all";
checkPhase = "omake check";
@ -28,6 +39,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/teyjus/teyjus";
license = lib.licenses.gpl3;
maintainers = [ maintainers.bcdarwin ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

View file

@ -15734,11 +15734,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Cocoa Foundation;
};
teyjus = callPackage ../development/compilers/teyjus (
with ocaml-ng.ocamlPackages_4_02; {
inherit ocaml;
omake = omake_rc1;
});
teyjus = callPackage ../development/compilers/teyjus { };
thrust = callPackage ../development/tools/thrust {
gconf = gnome2.GConf;