diff options
Diffstat (limited to 'pkgs/applications/science/misc')
-rw-r--r-- | pkgs/applications/science/misc/boinc/default.nix | 52 | ||||
-rw-r--r-- | pkgs/applications/science/misc/fityk/default.nix | 29 |
2 files changed, 67 insertions, 14 deletions
diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index aa7431504adde..641e5a8997b5c 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -1,6 +1,28 @@ -{ fetchFromGitHub, lib, stdenv, autoconf, automake, pkg-config, m4, curl, -libGLU, libGL, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK30, xcbutil, -sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }: +{ fetchFromGitHub +, lib +, stdenv +, autoconf +, automake +, pkg-config +, m4 +, curl +, libGLU +, libGL +, libXmu +, libXi +, freeglut +, libjpeg +, libtool +, wxGTK32 +, xcbutil +, sqlite +, gtk3 +, patchelf +, libXScrnSaver +, libnotify +, libX11 +, libxcb +}: let majorVersion = "7.20"; @@ -22,8 +44,22 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ]; buildInputs = [ - curl libGLU libGL libXmu libXi freeglut libjpeg wxGTK30 sqlite gtk2 libXScrnSaver - libnotify patchelf libX11 libxcb xcbutil + curl + libGLU + libGL + libXmu + libXi + freeglut + libjpeg + wxGTK32 + sqlite + gtk3 + libXScrnSaver + libnotify + patchelf + libX11 + libxcb + xcbutil ]; NIX_LDFLAGS = "-lX11"; @@ -45,11 +81,7 @@ stdenv.mkDerivation rec { description = "Free software for distributed and grid computing"; homepage = "https://boinc.berkeley.edu/"; license = licenses.lgpl2Plus; - platforms = platforms.linux; # arbitrary choice - # checking for gcc options needed to detect all undeclared functions... cannot detect - # configure: error: in `/build/boinc-7.18.1-src': - # configure: error: cannot make gcc report undeclared builtins - broken = stdenv.isAarch64; + platforms = platforms.linux; maintainers = with maintainers; [ Luflosi ]; }; } diff --git a/pkgs/applications/science/misc/fityk/default.nix b/pkgs/applications/science/misc/fityk/default.nix index f254947060803..a4aa6457d608d 100644 --- a/pkgs/applications/science/misc/fityk/default.nix +++ b/pkgs/applications/science/misc/fityk/default.nix @@ -1,5 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, boost, lua, zlib, bzip2 -, xylib, readline, gnuplot, swig3 }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, wxGTK32 +, boost +, lua +, zlib +, bzip2 +, xylib +, readline +, gnuplot +, swig3 +}: stdenv.mkDerivation rec { pname = "fityk"; @@ -13,8 +25,17 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ wxGTK30 boost lua zlib bzip2 xylib readline - gnuplot swig3 ]; + buildInputs = [ + wxGTK32 + boost + lua + zlib + bzip2 + xylib + readline + gnuplot + swig3 + ]; NIX_CFLAGS_COMPILE = [ "-std=c++11" |