summary refs log tree commit diff
diff options
context:
space:
mode:
authorBojan Nikolic <bojan@bnikolic.co.uk>2018-01-02 22:37:12 +0000
committerJohn Ericson <John.Ericson@Obsidian.Systems>2018-01-02 19:01:18 -0500
commitdb475df127f8c82853181c46501c142ff020c3d8 (patch)
tree43d75062151f2f29978cacaa57b03dcdc0009007
parentcb8349f59f8e3bf658865b5bc34f07c4e8868bc3 (diff)
downloadnixpkgs-db475df127f8c82853181c46501c142ff020c3d8.tar
nixpkgs-db475df127f8c82853181c46501c142ff020c3d8.tar.gz
nixpkgs-db475df127f8c82853181c46501c142ff020c3d8.tar.bz2
nixpkgs-db475df127f8c82853181c46501c142ff020c3d8.tar.lz
nixpkgs-db475df127f8c82853181c46501c142ff020c3d8.tar.xz
nixpkgs-db475df127f8c82853181c46501c142ff020c3d8.tar.zst
nixpkgs-db475df127f8c82853181c46501c142ff020c3d8.zip
mingw-w64-pthreads: The C compiler is needed
It was a copy and paste error from the headers derivation. Also test in
release-cross.
-rw-r--r--pkgs/os-specific/windows/mingw-w64/pthreads.nix4
-rw-r--r--pkgs/top-level/release-cross.nix1
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/os-specific/windows/mingw-w64/pthreads.nix b/pkgs/os-specific/windows/mingw-w64/pthreads.nix
index c585ab54ff8..1a33e8db07e 100644
--- a/pkgs/os-specific/windows/mingw-w64/pthreads.nix
+++ b/pkgs/os-specific/windows/mingw-w64/pthreads.nix
@@ -1,9 +1,9 @@
-{ stdenvNoCC, callPackage }:
+{ stdenv, callPackage }:
 
 let
   inherit (callPackage ./common.nix {}) name src;
 
-in stdenvNoCC.mkDerivation {
+in stdenv.mkDerivation {
   name = name + "-pthreads";
   inherit src;
 
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index b00d74b5e14..ce6fba9c40f 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -41,6 +41,7 @@ let
     libtool = nativePlatforms;
     libunistring = nativePlatforms;
     windows.wxMSW = nativePlatforms;
+    windows.mingw_w64_pthreads = nativePlatforms;
   };
 
   darwinCommon = {