diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-08-25 16:53:05 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-08-25 16:53:05 +0000 |
| commit | b0849305d63df6cc0acfe199cec3a997ad3c5a75 (patch) | |
| tree | 6ff64291dec94a85c6e523a3f78da127a7daa1dd /pkgs/applications/science/misc/root/default.nix | |
| parent | c901f337b8fed63ba0bb53674950ce4c7bf94dcd (diff) | |
| parent | 7e07d142e78656c5f16b18d81ee4eb9444c9b93d (diff) | |
| download | nixpkgs-b0849305d63df6cc0acfe199cec3a997ad3c5a75.tar nixpkgs-b0849305d63df6cc0acfe199cec3a997ad3c5a75.tar.gz nixpkgs-b0849305d63df6cc0acfe199cec3a997ad3c5a75.tar.bz2 nixpkgs-b0849305d63df6cc0acfe199cec3a997ad3c5a75.tar.lz nixpkgs-b0849305d63df6cc0acfe199cec3a997ad3c5a75.tar.xz nixpkgs-b0849305d63df6cc0acfe199cec3a997ad3c5a75.tar.zst nixpkgs-b0849305d63df6cc0acfe199cec3a997ad3c5a75.zip | |
Merge remote-tracking branch 'nixpkgs/master' into master
Diffstat (limited to 'pkgs/applications/science/misc/root/default.nix')
| -rw-r--r-- | pkgs/applications/science/misc/root/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 990952e21ac..97d8d4e7cee 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, cmake, gl2ps, gsl, libX11, libXpm, libXft +{ stdenv, lib, fetchurl, makeWrapper, cmake, gl2ps, gsl, libX11, libXpm, libXft , libXext, libGLU, libGL, libxml2, lz4, lzma, pcre, pkgconfig, python, xxHash , zlib , Cocoa, OpenGL, noSplash ? false }: @@ -13,11 +13,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper cmake pkgconfig ]; - buildInputs = [ gl2ps pcre python zlib libxml2 lz4 lzma gsl xxHash ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] - ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] + buildInputs = [ gl2ps pcre zlib libxml2 lz4 lzma gsl xxHash python.pkgs.numpy ] + ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] + ++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; - propagatedBuildInputs = [ python.pkgs.numpy ]; patches = [ ./sw_vers.patch |