Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: beea3c9d3651
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d49e4f607ff3
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 21, 2018

  1. mysocketw: fix darwin build 

    /cc ZHF #36454

(cherry picked from commit 18474c1)
    @LnL7
    LnL7 committed Mar 21, 2018
    Copy the full SHA
    d49e4f6 View commit details
Showing with 7 additions and 4 deletions.
  1. +7 −4 pkgs/development/libraries/mysocketw/default.nix
11 changes: 7 additions & 4 deletions pkgs/development/libraries/mysocketw/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{stdenv, fetchurl, openssl}:
{ stdenv, fetchurl, openssl }:

stdenv.mkDerivation rec {
name = "mysocketw-031026";
@@ -9,11 +9,14 @@ stdenv.mkDerivation rec {

patches = [ ./gcc.patch ];

configurePhase = ''
sed -i s,/usr/local,$out, Makefile.conf
buildInputs = [ openssl ];

postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace src/Makefile \
--replace -Wl,-soname, -Wl,-install_name,$out/lib/
'';

buildInputs = [ openssl ];
makeFlags = [ "PREFIX=$(out)" "CXX=c++" ];

meta = {
description = "Cross platform (Linux/FreeBSD/Unix/Win32) streaming socket C++";