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

openjade: Use default gcc

Browse Source
This commit is contained in:
Eelco Dolstra 2013-01-28 18:04:52 +01:00
parent b5ce83d38d
commit 6930efd1e5
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/tools/text/sgml/openjade/default.nix
View File

@ -1,22 +1,19 @@
{stdenv, fetchurl, opensp, perl}:
{ stdenv, fetchurl, opensp, perl }:
stdenv.mkDerivation {
# OpenJade-1.3.2 requires gcc 3.3 to build.
# The next release is likely to be compatible with newer gccs.
# If so the overrideGCC in top-level/all-packages should be removed.
name = "OpenJade-1.3.2";
stdenv.mkDerivation rec {
name = "openjade-1.3.2";
src = fetchurl {
url = "mirror://sourceforge/openjade/openjade-1.3.2.tar.gz";
url = "mirror://sourceforge/openjade/${name}.tar.gz";
sha256 = "1l92sfvx1f0wmkbvzv1385y1gb3hh010xksi1iyviyclrjb7jb8x";
};
buildInputs = [opensp perl];
buildInputs = [ opensp perl ];
configureFlags = [
"--enable-spincludedir=${opensp}/include/OpenSP"
"--enable-splibdir=${opensp}/lib"
];
];
meta = {
description = "An implementation of DSSSL, an ISO standard for formatting SGML (and XML) documents";

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

@ -1242,10 +1242,7 @@ let
opendkim = callPackage ../development/libraries/opendkim { };
openjade = callPackage ../tools/text/sgml/openjade {
stdenv = overrideGCC stdenv gcc33;
opensp = opensp.override { stdenv = overrideGCC stdenv gcc33; };
};
openjade = callPackage ../tools/text/sgml/openjade { };
openobex = callPackage ../tools/bluetooth/openobex { };