Merge pull request #141201 from Artturin/tinyccbump

authored by Artturi and committed by GitHub f01fbcad 24d90f41

+19 -23
+19 -23
pkgs/development/compilers/tinycc/default.nix
··· 1 - { stdenv, lib, fetchFromRepoOrCz, perl, texinfo }: 2 - with lib; 1 + { stdenv, lib, fetchFromRepoOrCz, perl, texinfo, which }: 3 2 4 3 stdenv.mkDerivation rec { 5 4 pname = "tcc"; 6 - version = "0.9.27"; 7 - upstreamVersion = "release_${concatStringsSep "_" (builtins.splitVersion version)}"; 5 + version = "unstable-2021-10-09"; 8 6 9 7 src = fetchFromRepoOrCz { 10 8 repo = "tinycc"; 11 - rev = upstreamVersion; 12 - sha256 = "12mm1lqywz0akr2yb2axjfbw8lwv57nh395vzsk534riz03ml977"; 9 + rev = "ca11849ebb88ef4ff87beda46bf5687e22949bd6"; 10 + sha256 = "sha256-xnUDyTYZxbxUCblACyX73boBhU073VRqSy1SWlWsvIw="; 13 11 }; 14 12 15 - nativeBuildInputs = [ perl texinfo ]; 13 + nativeBuildInputs = [ perl texinfo which ]; 16 14 17 15 hardeningDisable = [ "fortify" ]; 18 - 19 - enableParallelBuilding = true; 20 16 21 17 postPatch = '' 22 - substituteInPlace "texi2pod.pl" \ 23 - --replace "/usr/bin/perl" "${perl}/bin/perl" 18 + patchShebangs texi2pod.pl 24 19 ''; 25 20 21 + configureFlags = [ 22 + "--cc=cc" 23 + "--crtprefix=${lib.getLib stdenv.cc.libc}/lib" 24 + "--sysincludepaths=${lib.getDev stdenv.cc.libc}/include:{B}/include" 25 + "--libpaths=${lib.getLib stdenv.cc.libc}/lib" 26 + # build cross compilers 27 + "--enable-cross" 28 + ]; 29 + 26 30 preConfigure = '' 27 31 echo ${version} > VERSION 28 - 29 - configureFlagsArray+=("--cc=cc") 30 32 configureFlagsArray+=("--elfinterp=$(< $NIX_CC/nix-support/dynamic-linker)") 31 - configureFlagsArray+=("--crtprefix=${getLib stdenv.cc.libc}/lib") 32 - configureFlagsArray+=("--sysincludepaths=${getDev stdenv.cc.libc}/include:{B}/include") 33 - configureFlagsArray+=("--libpaths=${getLib stdenv.cc.libc}/lib") 34 33 ''; 35 34 36 35 postFixup = '' ··· 47 46 doCheck = true; 48 47 checkTarget = "test"; 49 48 50 - meta = { 49 + meta = with lib; { 51 50 description = "Small, fast, and embeddable C compiler and interpreter"; 52 - 53 51 longDescription = '' 54 52 TinyCC (aka TCC) is a small but hyper fast C compiler. Unlike 55 53 other C compilers, it is meant to be self-sufficient: you do not ··· 73 71 With libtcc, you can use TCC as a backend for dynamic code 74 72 generation. 75 73 ''; 76 - 77 - homepage = "http://www.tinycc.org/"; 78 - license = licenses.mit; 79 - 80 - platforms = [ "x86_64-linux" ]; 74 + homepage = "https://repo.or.cz/tinycc.git"; 75 + license = licenses.lgpl21Only; 76 + platforms = platforms.linux; 81 77 maintainers = [ maintainers.joachifm ]; 82 78 }; 83 79 }