diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2018-01-02 19:10:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-02 19:10:59 -0500 |
| commit | 0e3be421e3b2c9b3b83658b7c6ae5ac7266297bd (patch) | |
| tree | 56e09f717a179e1e2d479af412b45515eba41a0b | |
| parent | 2b4502c78eee1426ae1762271145193f79feaeab (diff) | |
| parent | db475df127f8c82853181c46501c142ff020c3d8 (diff) | |
| download | nixlib-0e3be421e3b2c9b3b83658b7c6ae5ac7266297bd.tar nixlib-0e3be421e3b2c9b3b83658b7c6ae5ac7266297bd.tar.gz nixlib-0e3be421e3b2c9b3b83658b7c6ae5ac7266297bd.tar.bz2 nixlib-0e3be421e3b2c9b3b83658b7c6ae5ac7266297bd.tar.lz nixlib-0e3be421e3b2c9b3b83658b7c6ae5ac7266297bd.tar.xz nixlib-0e3be421e3b2c9b3b83658b7c6ae5ac7266297bd.tar.zst nixlib-0e3be421e3b2c9b3b83658b7c6ae5ac7266297bd.zip | |
Merge pull request #33357 from bnikolic/mingw64-pthreads
Correct derivation of pthreads on mingw64
| -rw-r--r-- | pkgs/os-specific/windows/mingw-w64/pthreads.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/release-cross.nix | 1 |
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 c585ab54ff89..1a33e8db07e8 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 b00d74b5e145..ce6fba9c40f3 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 = { |