about summary refs log tree commit diff
path: root/pkgs/development/compilers/dev86
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2016-05-18 17:10:02 +0200
committerFranz Pletz <fpletz@fnordicwalking.de>2016-05-18 17:10:02 +0200
commitf8d481754cf842ca6e6ac1427ce0f571f5a44108 (patch)
tree70e702285987429aed275e0d5e2dc15c050e1f8c /pkgs/development/compilers/dev86
parent9fbc20e2f89bc045efac7ade41949a2c2d571dec (diff)
parent3cd63ade1614d4c581735ffb0cebe181bf87dfc8 (diff)
downloadnixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar
nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.gz
nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.bz2
nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.lz
nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.xz
nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.zst
nixlib-f8d481754cf842ca6e6ac1427ce0f571f5a44108.zip
Merge remote-tracking branch 'origin/master' into hardened-stdenv
Diffstat (limited to 'pkgs/development/compilers/dev86')
-rw-r--r--pkgs/development/compilers/dev86/default.nix19
1 files changed, 6 insertions, 13 deletions
diff --git a/pkgs/development/compilers/dev86/default.nix b/pkgs/development/compilers/dev86/default.nix
index 900cb92ab807..ec33869761be 100644
--- a/pkgs/development/compilers/dev86/default.nix
+++ b/pkgs/development/compilers/dev86/default.nix
@@ -1,27 +1,20 @@
 { stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "dev86-0.16.19";
+stdenv.mkDerivation rec {
+  name = "dev86-${version}";
+  version = "0.16.21";
 
   src = fetchurl {
-    url = http://www.debath.co.uk/dev86/Dev86src-0.16.19.tar.gz;
-    sha256 = "33398b87ca85e2b69e4062cf59f2f7354af46da5edcba036c6f97bae17b8d00e";
+    url = "http://v3.sk/~lkundrak/dev86/Dev86src-${version}.tar.gz";
+    sha256 = "154dyr2ph4n0kwi8yx0n78j128kw29rk9r9f7s2gddzrdl712jr3";
   };
 
   hardeningDisable = [ "format" ];
 
   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/;
+    homepage = http://v3.sk/~lkundrak/dev86/;
   };
 }