Merge pull request #156396 from helsinki-systems/upd/mysocket
mysocketw: switch to fork with version 3.10.27
This commit is contained in:
commit
2b14787033
|
@ -1,15 +1,17 @@
|
|||
{ lib, stdenv, fetchurl, openssl }:
|
||||
{ lib, stdenv, fetchFromGitHub, openssl, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mysocketw";
|
||||
version = "031026";
|
||||
src = fetchurl {
|
||||
url = "https://www.digitalfanatics.org/cal/socketw/files/SocketW${version}.tar.gz";
|
||||
sha256 = "0crinikhdl7xihzmc3k3k41pgxy16d5ci8m9sza1lbibns7pdwj4";
|
||||
version = "3.10.27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RigsOfRods";
|
||||
repo = "socketw";
|
||||
rev = version;
|
||||
sha256 = "0xqcgwb1lyc2d8834sq5adbmggyn6vvb26jw20862sxa15j0qfd4";
|
||||
};
|
||||
|
||||
patches = [ ./gcc.patch ];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
|
@ -17,8 +19,6 @@ stdenv.mkDerivation rec {
|
|||
--replace -Wl,-soname, -Wl,-install_name,$out/lib/
|
||||
'';
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" "CXX=${stdenv.cc.targetPrefix}c++" ];
|
||||
|
||||
meta = {
|
||||
description = "Cross platform (Linux/FreeBSD/Unix/Win32) streaming socket C++";
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
|
|
|
@ -19023,9 +19023,7 @@ with pkgs;
|
|||
ogre = ogre1_9;
|
||||
};
|
||||
|
||||
mysocketw = callPackage ../development/libraries/mysocketw {
|
||||
openssl = openssl_1_0_2;
|
||||
};
|
||||
mysocketw = callPackage ../development/libraries/mysocketw { };
|
||||
|
||||
mythes = callPackage ../development/libraries/mythes { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue