From 7d56212df25ccd2a6f482dab7cdb7d75ab8606bc Mon Sep 17 00:00:00 2001 From: Martin Bravenboer Date: Mon, 16 Jun 2008 23:18:56 +0000 Subject: [PATCH] MinGW stdenv needs replace svn path=/nixpkgs/trunk/; revision=12130 --- pkgs/stdenv/mingw/default.nix | 8 +++++++- pkgs/stdenv/mingw/pkgs/default.nix | 5 +++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/mingw/default.nix b/pkgs/stdenv/mingw/default.nix index 81c3d2ae1d6..3b60564d34e 100644 --- a/pkgs/stdenv/mingw/default.nix +++ b/pkgs/stdenv/mingw/default.nix @@ -77,7 +77,7 @@ let { * binutils is on the path because it contains dlltool, which * is invoked on the PATH by some packages. */ - initialPath = [make binutils gccCore gccCpp mingwRuntimeSrc w32apiSrc msys]; + initialPath = [make binutils gccCore gccCpp mingwRuntimeSrc w32apiSrc replace msys]; gcc = gccCore; shell = msysShell; inherit curl; @@ -223,4 +223,10 @@ let { stdenv = stdenvInit3; inherit fetchurl; }; + + replace = + (import ./pkgs).replace { + stdenv = stdenvInit3; + inherit fetchurl; + }; } diff --git a/pkgs/stdenv/mingw/pkgs/default.nix b/pkgs/stdenv/mingw/pkgs/default.nix index 0f51aeb85f9..6c843e8d394 100755 --- a/pkgs/stdenv/mingw/pkgs/default.nix +++ b/pkgs/stdenv/mingw/pkgs/default.nix @@ -135,6 +135,11 @@ rec { }; }; + replace = {stdenv, fetchurl} : + import ../../../tools/text/replace { + inherit fetchurl stdenv; + }; + /* pkgs.coreutils pkgs.findutils