Merge pull request #445 from NixOS/win32

switch back to upstream nixpkgs for windows build

1 files changed, 15 insertions, 2 deletions

diff --git a/patchelf.nix b/patchelf.nix
index fdeba6b..6e8e59d 100644
--- a/patchelf.nix
+++ b/patchelf.nix
@@ -1,6 +1,19 @@
-{ stdenv, autoreconfHook, version, src }:
+{ stdenv, buildPackages, autoreconfHook, version, src, overrideCC }:
+let
+  # on windows we use win32 threads to get a fully static binary
+  gcc = buildPackages.wrapCC (buildPackages.gcc-unwrapped.override ({
+    threadsCross = {
+      model = "win32";
+      package = null;
+    };
+  }));
 
-stdenv.mkDerivation {
+  stdenv' = if (stdenv.cc.isGNU && stdenv.targetPlatform.isWindows) then
+    overrideCC stdenv gcc
+  else
+    stdenv;
+in
+stdenv'.mkDerivation {
   pname = "patchelf";
   inherit version src;
   nativeBuildInputs = [ autoreconfHook ];