mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 21:50:55 +00:00
Merge commit 'db475df127f8c82853181c46501c142ff020c3d8' into ericson2314-cross-base
This commit is contained in:
commit
e3993464d9
|
@ -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;
|
||||
|
||||
|
|
|
@ -41,6 +41,7 @@ let
|
|||
libtool = nativePlatforms;
|
||||
libunistring = nativePlatforms;
|
||||
windows.wxMSW = nativePlatforms;
|
||||
windows.mingw_w64_pthreads = nativePlatforms;
|
||||
};
|
||||
|
||||
darwinCommon = {
|
||||
|
|
Loading…
Reference in a new issue