JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sdcc: 3.5.0 -> 3.6.0

Browse Source 
* requires texinfo
* --std=c99 unneeded, fixed upstream
* can build with nixpkgs default boost (v1.62), so let's do that
This commit is contained in:
Bjørn Forsman 2017-02-07 21:55:45 +01:00
parent 4a90156912
commit c95f3a36cd
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/compilers/sdcc/default.nix
View File

@ -1,23 +1,21 @@
{ stdenv, fetchurl, bison, flex, boost, gputils ? null }: { stdenv, fetchurl, bison, flex, boost, texinfo, gputils ? null }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "3.5.0"; version = "3.6.0";
name = "sdcc-${version}"; name = "sdcc-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2"; url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2";
sha256 = "1aazz0yynr694q0rich7r03qls0zvsjc00il14pb4i22c78phagq"; sha256 = "0x53gh5yrrfjvlnkk29mjn8hq4v52alrsf7c8nsyzzq13sqwwpg8";
}; };
# TODO: remove this comment when gputils != null is tested # TODO: remove this comment when gputils != null is tested
buildInputs = [ bison flex boost gputils ]; buildInputs = [ bison flex boost texinfo gputils ];
configureFlags = '' configureFlags = ''
${if gputils == null then "--disable-pic14-port --disable-pic16-port" else ""} ${if gputils == null then "--disable-pic14-port --disable-pic16-port" else ""}
''; '';
NIX_CFLAGS_COMPILE = "--std=c99"; # http://sourceforge.net/p/sdcc/code/9106/
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Small Device C Compiler"; description = "Small Device C Compiler";
longDescription = '' longDescription = ''

2
pkgs/top-level/all-packages.nix
View File

@ -5808,7 +5808,7 @@ with pkgs;
scalafmt = callPackage ../development/tools/scalafmt { }; scalafmt = callPackage ../development/tools/scalafmt { };
sdcc = callPackage ../development/compilers/sdcc { boost = boost159; }; sdcc = callPackage ../development/compilers/sdcc { };
serpent = callPackage ../development/compilers/serpent { }; serpent = callPackage ../development/compilers/serpent { };