Skip to content

Commit

Permalink
Patch bash in test6952.d
Browse files Browse the repository at this point in the history
  • Loading branch information
lionello committed Apr 28, 2020
1 parent 6e7a36b commit e0777cb
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions pkgs/development/compilers/dmd/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub
, makeWrapper, unzip, which, writeTextFile
, curl, tzdata, gdb, darwin, git, callPackage
, targetPackages, fetchpatch
, targetPackages, fetchpatch, bash
, dmdBootstrap ? callPackage ./bootstrap.nix { }
, HOST_DMD ? "${dmdBootstrap}/bin/dmd"
, version ? "2.091.1"
Expand Down Expand Up @@ -74,7 +74,10 @@ stdenv.mkDerivation rec {
patchShebangs .
'';

postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isLinux ''
postPatch = ''
substituteInPlace dmd/test/dshell/test6952.d --replace "/usr/bin/env bash" "${bash}/bin/bash"
''
+ stdenv.lib.optionalString stdenv.hostPlatform.isLinux ''
substituteInPlace phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" ""
''
+ stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
Expand Down

0 comments on commit e0777cb

Please sign in to comment.