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

Merge pull request #24762 from matthewbauer/darwin-misc-fixes

Browse Source 
darwin: miscellaneous fixes
This commit is contained in:
Daiderd Jordan
2017-04-10 08:50:15 +02:00
committed by GitHub
parent 3766b87737 dd25b6da62
commit f8230518a2
11 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/botan/generic.nix
View File

@@ -3,6 +3,7 @@
, baseVersion, revision, sha256
, extraConfigureFlags ? ""
, postPatch ? null
, darwin
, ...
}:
@@ -20,7 +21,8 @@ stdenv.mkDerivation rec {
};
inherit postPatch;
buildInputs = [ python bzip2 zlib gmp openssl boost ];
buildInputs = [ python bzip2 zlib gmp openssl boost ]
++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
configurePhase = ''
python configure.py --prefix=$out --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""} ${extraConfigureFlags}${if stdenv.cc.isClang then " --cc=clang" else "" }

4
pkgs/development/libraries/liblastfm/default.nix
View File

@@ -1,4 +1,5 @@
{ stdenv, fetchurl, qt4, pkgconfig, libsamplerate, fftwSinglePrec, which, cmake }:
{ stdenv, fetchurl, qt4, pkgconfig, libsamplerate, fftwSinglePrec, which, cmake
, darwin }:
let version = "1.0.9"; in
@@ -15,6 +16,7 @@ stdenv.mkDerivation rec {
prefixKey = "--prefix ";
propagatedBuildInputs = [ qt4 libsamplerate fftwSinglePrec ];
nativeBuildInputs = [ pkgconfig which cmake ];
buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration;
meta = {
homepage = http://github.com/lastfm/liblastfm;

10
pkgs/development/libraries/wxsqlite3/default.nix
View File

@@ -1,4 +1,5 @@
{ stdenv, fetchFromGitHub, wxGTK, sqlite }:
{ stdenv, fetchFromGitHub, wxGTK, sqlite
, darwin }:
stdenv.mkDerivation rec {
name = "wxsqlite3-${version}";
@@ -11,7 +12,12 @@ stdenv.mkDerivation rec {
sha1 = "bb8p58g88nkdcsj3h4acx7h925n2cy9g";
};
buildInputs = [ wxGTK sqlite ];
preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
cp build28/Info.plist.in build28/wxmac.icns build/
'';
buildInputs = [ wxGTK sqlite ]
++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.stubs.setfile darwin.stubs.rez darwin.stubs.derez ];
meta = with stdenv.lib; {
homepage = http://utelle.github.io/wxsqlite3/ ;