diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index d4e4ed5b954f..71ceca122244 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -12,9 +12,11 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ]; - preBuild = '' - makeFlagsArray=("HSTDIR=${htslib}" "prefix=$out") - ''; + makeFlags = [ + "HSTDIR=${htslib}" + "prefix=$out" + "CC=cc" + ]; meta = with stdenv.lib; { description = "Tools for manipulating BCF2/VCF/gVCF format, SNP and short indel sequence variants"; diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/applications/science/logic/aspino/default.nix index 5207245b0ba6..ee9e580a7b87 100644 --- a/pkgs/applications/science/logic/aspino/default.nix +++ b/pkgs/applications/science/logic/aspino/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { buildInputs = [ zlib boost ]; + patchPhase = '' + substituteInPlace Makefile \ + --replace "GCC = g++" "GCC = c++" + ''; + preBuild = '' cp ${glucose.src} patches/glucose-syrup.tgz ./bootstrap.sh diff --git a/pkgs/applications/science/math/LiE/default.nix b/pkgs/applications/science/math/LiE/default.nix index b448b5114212..515b7e272899 100644 --- a/pkgs/applications/science/math/LiE/default.nix +++ b/pkgs/applications/science/math/LiE/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.2.2"; # 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. - name = "LiE-${version}"; + name = "lie-${version}"; meta = { 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. ''; # take from the website - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux; maintainers = [ ]; # this package is probably not going to change anyway }; diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index f1f598c1359c..f89947d7d61f 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { description = "Open-source electronics prototyping platform"; homepage = http://arduino.cc/; license = stdenv.lib.licenses.gpl2; - platforms = platforms.all; + platforms = platforms.linux; maintainers = with maintainers; [ antono robberer bjornfor ]; }; } diff --git a/pkgs/development/libraries/alure/default.nix b/pkgs/development/libraries/alure/default.nix index 200ff1ca2e7f..fe2892c96270 100644 --- a/pkgs/development/libraries/alure/default.nix +++ b/pkgs/development/libraries/alure/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "A utility library to help manage common tasks with OpenAL applications"; homepage = http://kcat.strangesoft.net/alure.html; license = licenses.mit; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix index 9cabfe31a188..bb44fe044e81 100644 --- a/pkgs/tools/video/atomicparsley/default.nix +++ b/pkgs/tools/video/atomicparsley/default.nix @@ -1,7 +1,7 @@ { stdenv, pkgs, fetchurl }: stdenv.mkDerivation rec { - name = "${product}-${version}"; + name = "atomicparsley-${version}"; product = "AtomicParsley"; version = "0.9.0"; @@ -10,12 +10,20 @@ stdenv.mkDerivation rec { sha256 = "de83f219f95e6fe59099b277e3ced86f0430ad9468e845783092821dff15a72e"; }; - buildInputs = with pkgs; [ unzip ]; + buildInputs = with pkgs; [ unzip ] + ++ stdenv.lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; patches = [ ./casts.patch ]; setSourceRoot = "sourceRoot=${product}-source-${version}"; buildPhase = "bash build"; installPhase = "install -D AtomicParsley $out/bin/AtomicParsley"; + postPatch = '' + substituteInPlace build \ + --replace 'g++' 'c++' + substituteInPlace AP_NSImage.mm \ + --replace '_NSBitmapImageFileType' 'NSBitmapImageFileType' + ''; + meta = with stdenv.lib; { description = '' A lightweight command line program for reading, parsing and diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f881093efb8..3f40615e5d20 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16545,7 +16545,7 @@ in 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 { };