diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-09-23 09:31:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-23 09:31:28 +0200 |
| commit | 56853dc6d83a861050bbc02041dbe65f7b1b6f63 (patch) | |
| tree | 70fdf276f8d889018a3ec9fc573e01fa961d289c /pkgs/applications/science | |
| parent | 343ac4d2fc6029ef6a2451d31890903f6afe79f2 (diff) | |
| parent | 92158a4b2cda39ab3990682aa23644462e1a5860 (diff) | |
| download | nixlib-56853dc6d83a861050bbc02041dbe65f7b1b6f63.tar nixlib-56853dc6d83a861050bbc02041dbe65f7b1b6f63.tar.gz nixlib-56853dc6d83a861050bbc02041dbe65f7b1b6f63.tar.bz2 nixlib-56853dc6d83a861050bbc02041dbe65f7b1b6f63.tar.lz nixlib-56853dc6d83a861050bbc02041dbe65f7b1b6f63.tar.xz nixlib-56853dc6d83a861050bbc02041dbe65f7b1b6f63.tar.zst nixlib-56853dc6d83a861050bbc02041dbe65f7b1b6f63.zip | |
Merge pull request #45941 from NixOS/staging-next
Staging next
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/electronics/kicad/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/science/electronics/kicad/unstable.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/science/logic/tlaplus/toolbox.nix | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 3e783d2e177c..c92da3eeb292 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -36,8 +36,7 @@ stdenv.mkDerivation rec { ++ optional (ngspiceSupport) "-DKICAD_SPICE=ON"; nativeBuildInputs = [ - # https://www.mail-archive.com/kicad-developers@lists.launchpad.net/msg29840.html - (cmake.override {majorVersion = "3.10";}) + cmake doxygen pkgconfig wrapGAppsHook diff --git a/pkgs/applications/science/electronics/kicad/unstable.nix b/pkgs/applications/science/electronics/kicad/unstable.nix index e43fd59e0431..a9a4c32a0b45 100644 --- a/pkgs/applications/science/electronics/kicad/unstable.nix +++ b/pkgs/applications/science/electronics/kicad/unstable.nix @@ -38,8 +38,7 @@ stdenv.mkDerivation rec { "-DCMAKE_CXX_FLAGS=-I${wxPython}/include/wx-3.0" ]; - # https://www.mail-archive.com/kicad-developers@lists.launchpad.net/msg29840.html - nativeBuildInputs = [ (cmake.override {majorVersion = "3.10";}) doxygen pkgconfig ]; + nativeBuildInputs = [ cmake doxygen pkgconfig ]; buildInputs = [ libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs cairo curl openssl boost diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix index 342d91cf5825..f1116a27c0be 100644 --- a/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -44,7 +44,7 @@ in stdenv.mkDerivation { --run "set -x; cd $out/toolbox" \ --add-flags "-data ~/.tla-toolbox" \ --prefix PATH : "${jre}/bin" \ - --prefix LD_LIBRARY_PATH : "${swt}/lib:${gtk}/lib:${libXtst}/lib:${glib}/lib" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ swt gtk libXtst glib ]}" echo -e "\nCreating TLA Toolbox icons..." pushd "$src" |