git.iko.soy/typeable/nixpkgs
on master help sign in
mysocketw: switch to fork with version 3.10.27
commit799d59f72503fe4da547fce984cba90bdfe9d713 authorajs124 <git@ajs124.de> dateWed 15 Dec 2021, 18:16 (5 years ago) parent96dedc9
2 files changed+10−12
pkgs/development/libraries/mysocketw/default.nix+9−9 pkgs/top-level/all-packages.nix+1−3
pkgs/development/libraries/mysocketw/default.nix+9−9
@@ -1,15 +1,17 @@
1−{ lib, stdenv, fetchurl, openssl }:
1+{ lib, stdenv, fetchFromGitHub, openssl, cmake }:
22
33stdenv.mkDerivation rec {
44 pname = "mysocketw";
5− version = "031026";
6− src = fetchurl {
7− url = "https://www.digitalfanatics.org/cal/socketw/files/SocketW${version}.tar.gz";
8− sha256 = "0crinikhdl7xihzmc3k3k41pgxy16d5ci8m9sza1lbibns7pdwj4";
9− };
5+ version = "3.10.27";
106
11− patches = [ ./gcc.patch ];
7+ src = fetchFromGitHub {
8+ owner = "RigsOfRods";
9+ repo = "socketw";
10+ rev = version;
11+ sha256 = "0xqcgwb1lyc2d8834sq5adbmggyn6vvb26jw20862sxa15j0qfd4";
12+ };
1213
14+ nativeBuildInputs = [ cmake ];
1315 buildInputs = [ openssl ];
1416
1517 postPatch = lib.optionalString stdenv.isDarwin ''
@@ -17,8 +19,6 @@ stdenv.mkDerivation rec {
1719 --replace -Wl,-soname, -Wl,-install_name,$out/lib/
1820 '';
1921
20− makeFlags = [ "PREFIX=$(out)" "CXX=${stdenv.cc.targetPrefix}c++" ];
21−
2222 meta = {
2323 description = "Cross platform (Linux/FreeBSD/Unix/Win32) streaming socket C++";
2424 license = lib.licenses.lgpl21Plus;
pkgs/top-level/all-packages.nix+1−3
@@ -18984,9 +18984,7 @@ with pkgs;
1898418984 ogre = ogre1_9;
1898518985 };
1898618986
18987− mysocketw = callPackage ../development/libraries/mysocketw {
18988− openssl = openssl_1_0_2;
18989− };
18987+ mysocketw = callPackage ../development/libraries/mysocketw { };
1899018988
1899118989 mythes = callPackage ../development/libraries/mythes { };
1899218990