public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'db475df127f8c82853181c46501c142ff020c3d8' into ericson2314-cross-base

Browse Source
This commit is contained in:
John Ericson
2018-01-02 19:50:28 -05:00
parent 00b038a3f8 db475df127
commit e3993464d9
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/windows/mingw-w64/pthreads.nix
+2 -2
View File
@@ -1,9 +1,9 @@
{ stdenvNoCC, callPackage }: { stdenv, callPackage }:
let let
inherit (callPackage ./common.nix {}) name src; inherit (callPackage ./common.nix {}) name src;
in stdenvNoCC.mkDerivation { in stdenv.mkDerivation {
name = name + "-pthreads"; name = name + "-pthreads";
inherit src; inherit src;
pkgs/top-level/release-cross.nix
+1
View File
@@ -41,6 +41,7 @@ let
libtool = nativePlatforms; libtool = nativePlatforms;
libunistring = nativePlatforms; libunistring = nativePlatforms;
windows.wxMSW = nativePlatforms; windows.wxMSW = nativePlatforms;
windows.mingw_w64_pthreads = nativePlatforms;
}; };
darwinCommon = { darwinCommon = {