diff options
| author | Joachim Fasting <joachifm@fastmail.fm> | 2017-02-08 04:09:48 +0100 |
|---|---|---|
| committer | Joachim Fasting <joachifm@fastmail.fm> | 2017-02-09 16:22:57 +0100 |
| commit | a9c347b9e378de79fb3b901a9cbdb42e83a1c408 (patch) | |
| tree | 94cef0ad9ce371d37718d32607df04687786eee8 /pkgs/development/compilers/tinycc | |
| parent | ae33b4673de75b0555d3981e675415ebc2231987 (diff) | |
| download | nixpkgs-a9c347b9e378de79fb3b901a9cbdb42e83a1c408.tar nixpkgs-a9c347b9e378de79fb3b901a9cbdb42e83a1c408.tar.gz nixpkgs-a9c347b9e378de79fb3b901a9cbdb42e83a1c408.tar.bz2 nixpkgs-a9c347b9e378de79fb3b901a9cbdb42e83a1c408.tar.lz nixpkgs-a9c347b9e378de79fb3b901a9cbdb42e83a1c408.tar.xz nixpkgs-a9c347b9e378de79fb3b901a9cbdb42e83a1c408.tar.zst nixpkgs-a9c347b9e378de79fb3b901a9cbdb42e83a1c408.zip | |
tinycc: 20160525 -> 20170108
Per https://www.mail-archive.com/tinycc-devel@nongnu.org/msg07274.html http://repo.or.cz/tinycc.git/commit/77d7ea04acb56f839031993c102366e30cad5c25 onward ought to be fairly stable.
Diffstat (limited to 'pkgs/development/compilers/tinycc')
| -rw-r--r-- | pkgs/development/compilers/tinycc/default.nix | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index 446db73bacc..d9f33bcc6b2 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -1,14 +1,11 @@ { stdenv, fetchFromRepoOrCz, perl, texinfo }: - -assert (stdenv.isGlibc); - with stdenv.lib; let - date = "20160525"; + date = "20170108"; version = "0.9.27pre-${date}"; - rev = "1ca685f887310b5cbdc415cdfc3a578dbc8d82d8"; - sha256 = "149s847jkg2zdmk09h0cp0q69m8kxxci441zyw8b08fy9b87ayd8"; + rev = "5420bb8a67f5f782ac49c90afb7da178a60c448a"; + sha256 = "0gf1ys4vv5qfkh6462fkdv44mz5chhrchlvgcl0m44f8mm8cjwa3"; in stdenv.mkDerivation rec { @@ -20,8 +17,6 @@ stdenv.mkDerivation rec { inherit sha256; }; - outputs = [ "bin" "dev" "out" ]; - nativeBuildInputs = [ perl texinfo ]; hardeningDisable = [ "fortify" ]; @@ -32,17 +27,20 @@ stdenv.mkDerivation rec { ''; preConfigure = '' - configureFlagsArray+=("--elfinterp=$(cat $NIX_CC/nix-support/dynamic-linker)") - configureFlagsArray+=("--crtprefix=${stdenv.glibc.out}/lib") - configureFlagsArray+=("--sysincludepaths=${stdenv.glibc.dev}/include:{B}/include") - configureFlagsArray+=("--libpaths=${stdenv.glibc.out}/lib") + echo ${version} > VERSION + + configureFlagsArray+=("--cc=cc") + configureFlagsArray+=("--elfinterp=$(< $NIX_CC/nix-support/dynamic-linker)") + configureFlagsArray+=("--crtprefix=${getLib stdenv.cc.libc}/lib") + configureFlagsArray+=("--sysincludepaths=${getDev stdenv.cc.libc}/include:{B}/include") + configureFlagsArray+=("--libpaths=${getLib stdenv.cc.libc}/lib") ''; doCheck = true; checkTarget = "test"; postFixup = '' - paxmark m $bin/bin/tcc + paxmark m $out/bin/tcc ''; meta = { |