diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-05 17:26:13 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-21 15:49:53 -0400 |
commit | 531e4b80c97002a542beb8fe356177ebd66cdd8e (patch) | |
tree | 4fb5b90d44ecb5a7b15fdc7d6e10bda66f4542f0 /pkgs/applications/science/misc | |
parent | fd9c7eb2e8c1755b606cb0d7dab2ba0bb93e36ed (diff) | |
download | nixlib-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar nixlib-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar.gz nixlib-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar.bz2 nixlib-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar.lz nixlib-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar.xz nixlib-531e4b80c97002a542beb8fe356177ebd66cdd8e.tar.zst nixlib-531e4b80c97002a542beb8fe356177ebd66cdd8e.zip |
misc pkgs: Basic sed to get fix `pkgconfig` and `autoreconfHook` `buildInputs`
Only acts on one-line dependency lists.
Diffstat (limited to 'pkgs/applications/science/misc')
-rw-r--r-- | pkgs/applications/science/misc/fityk/default.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/science/misc/root/default.nix | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/science/misc/fityk/default.nix b/pkgs/applications/science/misc/fityk/default.nix index 1c1cac203f8b..8d0336f58282 100644 --- a/pkgs/applications/science/misc/fityk/default.nix +++ b/pkgs/applications/science/misc/fityk/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation { sha256 = "0kmrjjjwrh6xgw590awcd52b86kksmv6rfgih75zvpiavr1ygwsi"; }; - buildInputs = [ autoreconfHook wxGTK30 boost lua zlib bzip2 xylib readline + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ wxGTK30 boost lua zlib bzip2 xylib readline gnuplot swig3 ]; meta = { diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index b220bb8a80ce..ac04321ae0c4 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0nwg4bw02v6vahm2rwfaj7fzp3ffhjg5jk7h20il4246swhxw6s6"; }; - buildInputs = [ cmake pcre pkgconfig python2 zlib libxml2 lzma gsl ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake pcre python2 zlib libxml2 lzma gsl ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext mesa ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; |