diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-28 07:43:04 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-28 07:43:04 +0200 |
| commit | fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00 (patch) | |
| tree | dba7ec5e6a0757a413e8cb9dfb01bb14abc469f4 /pkgs/applications/science | |
| parent | 15f9bdb6489e7e55a861958a9388bf5ad3b2d2cd (diff) | |
| parent | 217cf982c754f1e8506e180551c73f57c04aed7f (diff) | |
| download | nixlib-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar nixlib-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar.gz nixlib-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar.bz2 nixlib-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar.lz nixlib-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar.xz nixlib-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar.zst nixlib-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.zip | |
Merge branch 'staging-next'
There are several security fixes - again, as it consists mainly of the previously reverted staging-next merge.
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/electronics/kicad/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/science/math/glsurf/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index f31dd0daa5c3..bd57e355c757 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -107,7 +107,7 @@ in stdenv.mkDerivation rec { buildPythonPath "$out $pythonPath" gappsWrapperArgs+=(--set PYTHONPATH "$program_PYTHONPATH") - wrapProgram "$out/bin/kicad" "''${gappsWrapperArgs[@]}" + wrapGApp "$out/bin/kicad" ''; meta = { diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 4de683cdce90..1cd5e364208a 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, ocamlPackages, libGLU_combined, freeglut -, mysql, mpfr, gmp, libtiff, libjpeg, libpng, giflib +, libmysqlclient, mpfr, gmp, libtiff, libjpeg, libpng, giflib }: stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7"; }; - buildInputs = [ freeglut libGLU_combined mysql.connector-c mpfr gmp + buildInputs = [ freeglut libGLU_combined libmysqlclient mpfr gmp libtiff libjpeg libpng giflib ] ++ (with ocamlPackages; [ ocaml findlib ocaml_mysql lablgl camlimages_4_0 mlgmpidl |