Author: eelco
Date: Wed Dec 22 18:34:21 2010
New Revision: 25246
URL: https://svn.nixos.org/websvn/nix/?rev=25246&sc=1
Log:
* Get dev86 to compile. Apparantly it has trouble with the latest
gcc/binutils.
Deleted:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/dev86/dev86-0.16.17-noelks-1.patch
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/dev86/default.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/dev86/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/dev86/default.nix
Wed Dec 22 17:03:30 2010 (r25245)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/dev86/default.nix
Wed Dec 22 18:34:21 2010 (r25246)
@@ -1,18 +1,23 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
stdenv.mkDerivation {
- name = "dev86-0.16.17";
+ name = "dev86-0.16.18";
+
src = fetchurl {
- url =
http://homepage.ntlworld.com/robert.debath/dev86/Dev86src-0.16.17.tar.gz;
- md5 = "e7bbfdbe61c2fb964994a087e29b0087";
+ url = http://www.debath.co.uk/dev86/Dev86src-0.16.18.tar.gz;
+ sha256 = "1wcg2x8i2fq7kqgazx2il3qfmikyi4kfb23vm45yxlwq72l55604";
};
- patches = [ ./dev86-0.16.17-noelks-1.patch ];
-
- preBuild = "
- makeFlags=\"PREFIX=$out\"
- ";
+ makeFlags = "PREFIX=$(out)";
+ # Awful hackery to get dev86 to compile with recent gcc/binutils.
+ # See http://bugs.gentoo.org/214964 for some inconclusive
+ # discussion.
+ preBuild =
+ ''
+ substituteInPlace makefile.in --replace "-O2" "" --replace "-O" ""
+ '';
+
meta = {
description = "Linux 8086 development environment";
homepage = http://www.debath.co.uk/;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
