diff options
author | obadz <obadz-git@obadz.com> | 2016-08-27 23:54:54 +0100 |
---|---|---|
committer | obadz <obadz-git@obadz.com> | 2016-08-27 23:54:54 +0100 |
commit | 3de6e5be50124834f9d0adfc299295e9e6e30c08 (patch) | |
tree | 31c4c7003ca554e75fa7ead8242f00922a92b25f /pkgs/applications/science | |
parent | 132571454c8162cdefe9e94613137d6a13b950b7 (diff) | |
parent | df27c35e9a0515146eb7db07e11af59e520214a6 (diff) | |
download | nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.gz nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.bz2 nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.lz nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.xz nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.zst nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.zip |
Merge branch 'master' into staging
Conflicts: pkgs/applications/misc/navit/default.nix pkgs/applications/networking/mailreaders/alpine/default.nix pkgs/applications/networking/mailreaders/realpine/default.nix pkgs/development/compilers/ghc/head.nix pkgs/development/libraries/openssl/default.nix pkgs/games/liquidwar/default.nix pkgs/games/spring/springlobby.nix pkgs/os-specific/linux/kernel/perf.nix pkgs/servers/sip/freeswitch/default.nix pkgs/tools/archivers/cromfs/default.nix pkgs/tools/graphics/plotutils/default.nix
Diffstat (limited to 'pkgs/applications/science')
3 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index 19fa277341a5..eb5506e74908 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, mesa, libpng, lua5, automake, autoconf }: +{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, libSM, libICE, mesa, libpng, lua5, autoconf, automake }: stdenv.mkDerivation rec { name = "gravit-0.5.1"; @@ -8,9 +8,11 @@ stdenv.mkDerivation rec { sha256 = "14vf7zj2bgrl96wsl3f1knsggc8h9624354ajzd72l46y09x5ky7"; }; - buildInputs = [mesa SDL SDL_ttf SDL_image lua5 automake autoconf libpng]; + buildInputs = [ mesa SDL SDL_ttf SDL_image lua5 libpng libSM libICE ]; - preConfigure = "sh autogen.sh"; + nativeBuildInputs = [ autoconf automake ]; + + preConfigure = "./autogen.sh"; meta = { homepage = "http://gravit.slowchop.com"; diff --git a/pkgs/applications/science/math/perseus/default.nix b/pkgs/applications/science/math/perseus/default.nix index ae63716f106d..55293e6c8a79 100644 --- a/pkgs/applications/science/math/perseus/default.nix +++ b/pkgs/applications/science/math/perseus/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, unzip, gcc48 }: +{ stdenv, fetchurl, unzip }: stdenv.mkDerivation { name = "perseus-4-beta"; version = "4-beta"; - buildInputs = [unzip gcc48]; + buildInputs = [ unzip ]; hardeningDisable = [ "stackprotector" ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation { sourceRoot = "."; buildPhase = '' - g++ Pers.cpp -O3 -o perseus + g++ Pers.cpp -O3 -fpermissive -o perseus ''; installPhase = '' diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 81f5accd4780..4222336fe9b2 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, git, espeak, SDL, udev, doxygen, cmake, overrideCC#, gcc48 +{ stdenv, fetchgit, git, espeak, SDL, udev, doxygen, cmake , qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns , qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmakeHook , makeQtWrapper, lndir |