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

Merge pull request #17657 from matthewbauer/darwin-misc

Browse Source 
Darwin misc. fixes
This commit is contained in:
Robin Gloster 2016-08-11 16:41:34 +00:00 committed by GitHub
commit 40d217b90e
7 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/science/biology/bcftools/default.nix
View File

@ -12,9 +12,11 @@ stdenv.mkDerivation rec {
buildInputs = [ zlib ]; buildInputs = [ zlib ];
preBuild = '' makeFlags = [
makeFlagsArray=("HSTDIR=${htslib}" "prefix=$out") "HSTDIR=${htslib}"
''; "prefix=$out"
"CC=cc"
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Tools for manipulating BCF2/VCF/gVCF format, SNP and short indel sequence variants"; description = "Tools for manipulating BCF2/VCF/gVCF format, SNP and short indel sequence variants";

5
pkgs/applications/science/logic/aspino/default.nix
View File

@ -11,6 +11,11 @@ stdenv.mkDerivation rec {
buildInputs = [ zlib boost ]; buildInputs = [ zlib boost ];
patchPhase = ''
substituteInPlace Makefile \
--replace "GCC = g++" "GCC = c++"
'';
preBuild = '' preBuild = ''
cp ${glucose.src} patches/glucose-syrup.tgz cp ${glucose.src} patches/glucose-syrup.tgz
./bootstrap.sh ./bootstrap.sh

4
pkgs/applications/science/math/LiE/default.nix
View File

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "2.2.2"; version = "2.2.2";
# The current version of LiE is 2.2.2, which is more or less unchanged # The current version of LiE is 2.2.2, which is more or less unchanged
# since about the year 2000. Minor bugfixes do get applied now and then. # since about the year 2000. Minor bugfixes do get applied now and then.
name = "LiE-${version}"; name = "lie-${version}";
meta = { meta = {
description = "A Computer algebra package for Lie group computations"; description = "A Computer algebra package for Lie group computations";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
characteristics, we refer to the following sources of information. characteristics, we refer to the following sources of information.
''; # take from the website ''; # take from the website
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.linux;
maintainers = [ ]; # this package is probably not going to change anyway maintainers = [ ]; # this package is probably not going to change anyway
}; };

2
pkgs/development/arduino/arduino-core/default.nix
View File

@ -112,7 +112,7 @@ stdenv.mkDerivation rec {
description = "Open-source electronics prototyping platform"; description = "Open-source electronics prototyping platform";
homepage = http://arduino.cc/; homepage = http://arduino.cc/;
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
platforms = platforms.all; platforms = platforms.linux;
maintainers = with maintainers; [ antono robberer bjornfor ]; maintainers = with maintainers; [ antono robberer bjornfor ];
}; };
} }

2
pkgs/development/libraries/alure/default.nix
View File

@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
description = "A utility library to help manage common tasks with OpenAL applications"; description = "A utility library to help manage common tasks with OpenAL applications";
homepage = http://kcat.strangesoft.net/alure.html; homepage = http://kcat.strangesoft.net/alure.html;
license = licenses.mit; license = licenses.mit;
platforms = platforms.unix; platforms = platforms.linux;
}; };
} }

12
pkgs/tools/video/atomicparsley/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, pkgs, fetchurl }: { stdenv, pkgs, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${product}-${version}"; name = "atomicparsley-${version}";
product = "AtomicParsley"; product = "AtomicParsley";
version = "0.9.0"; version = "0.9.0";
@ -10,12 +10,20 @@ stdenv.mkDerivation rec {
sha256 = "de83f219f95e6fe59099b277e3ced86f0430ad9468e845783092821dff15a72e"; sha256 = "de83f219f95e6fe59099b277e3ced86f0430ad9468e845783092821dff15a72e";
}; };
buildInputs = with pkgs; [ unzip ]; buildInputs = with pkgs; [ unzip ]
++ stdenv.lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ];
patches = [ ./casts.patch ]; patches = [ ./casts.patch ];
setSourceRoot = "sourceRoot=${product}-source-${version}"; setSourceRoot = "sourceRoot=${product}-source-${version}";
buildPhase = "bash build"; buildPhase = "bash build";
installPhase = "install -D AtomicParsley $out/bin/AtomicParsley"; installPhase = "install -D AtomicParsley $out/bin/AtomicParsley";
postPatch = ''
substituteInPlace build \
--replace 'g++' 'c++'
substituteInPlace AP_NSImage.mm \
--replace '_NSBitmapImageFileType' 'NSBitmapImageFileType'
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = '' description = ''
A lightweight command line program for reading, parsing and A lightweight command line program for reading, parsing and

2
pkgs/top-level/all-packages.nix
View File

@ -16545,7 +16545,7 @@ in
openspecfun = callPackage ../development/libraries/science/math/openspecfun {}; openspecfun = callPackage ../development/libraries/science/math/openspecfun {};
LiE = callPackage ../applications/science/math/LiE { }; lie = callPackage ../applications/science/math/LiE { };
magma = callPackage ../development/libraries/science/math/magma { }; magma = callPackage ../development/libraries/science/math/magma { };