~vonfry/omnetpp-nix

831c757b59efaa15a5dc2ae6c07e8f250f1ac1ba — Vonfry 9 months ago cd1d560
omnetpp: update python to python3
2 files changed, 3 insertions(+), 3 deletions(-)

M default.nix
M pkgs.nix
M default.nix => default.nix +2 -2
@@ 5,7 5,7 @@
  pango, libglvnd, libsecret, withNEDDocGen ? true, graphviz, doxygen,
  with3dVisualization ? false, openscenegraph, osgearth, withParallel ? true,
  openmpi, withPCAP ? true, libpcap, QT_STYLE_OVERRIDE ? "fusion",
  python ? null, R ? null, sqlite, preferSqlite ? true,
  python3, R ? null, sqlite, preferSqlite ? true,
  # not free
  akaroa ? null
}:


@@ 50,7 50,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = optional withIDE [ makeWrapper ];

  propagatedBuildInputs = [ python R sqlite ]
  propagatedBuildInputs = [ python3 R sqlite ]
                       ++ optionals with3dVisualization [ osgearth
                                                          openscenegraph
                                                        ]

M pkgs.nix => pkgs.nix +1 -1
@@ 7,7 7,7 @@ let
    inherit (qt5) qtbase wrapQtAppsHook;
    inherit (xorg) libX11 libXrender libXtst;
    gtk = gtk3;
  } ;
  };

  nixPkgs =  rec {
    callPackage = pkgs.newScope (defaultScope // nixPkgs);