diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-10-13 10:40:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-13 10:40:14 +0200 |
| commit | cffdffe1f679a4beaf99355d26d38b23879474d7 (patch) | |
| tree | d640fe7549815fe0e545447a2c9503d04af398d8 /pkgs/tools/misc | |
| parent | 727fc259d60e02ccfe70a25120caa161a9afbda7 (diff) | |
| parent | 1e544b2993a6aff0b60dd24f47258ebcccba9697 (diff) | |
| download | nixlib-cffdffe1f679a4beaf99355d26d38b23879474d7.tar nixlib-cffdffe1f679a4beaf99355d26d38b23879474d7.tar.gz nixlib-cffdffe1f679a4beaf99355d26d38b23879474d7.tar.bz2 nixlib-cffdffe1f679a4beaf99355d26d38b23879474d7.tar.lz nixlib-cffdffe1f679a4beaf99355d26d38b23879474d7.tar.xz nixlib-cffdffe1f679a4beaf99355d26d38b23879474d7.tar.zst nixlib-cffdffe1f679a4beaf99355d26d38b23879474d7.zip | |
Merge pull request #19309 from FRidh/outputs
Python: use separate output for tkinter
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/openopc/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/tools/misc/venus/default.nix | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/tools/misc/openopc/default.nix b/pkgs/tools/misc/openopc/default.nix index 2fce3807ca7e..9da59824e292 100644 --- a/pkgs/tools/misc/openopc/default.nix +++ b/pkgs/tools/misc/openopc/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, pythonFull }: +{ stdenv, fetchurl, python }: -stdenv.mkDerivation rec { +let + pythonEnv = python.withPackages(ps: [ps.pyro3]); +in stdenv.mkDerivation rec { name = "openopc-${version}"; version = "1.2.0"; @@ -13,16 +15,16 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out/bin" mkdir -p "$out/share/doc/openopc" - mkdir -p "$out/${pythonFull.python.sitePackages}" + mkdir -p "$out/${pythonEnv.python.sitePackages}" mkdir -p "$out/libexec/opc" - cp src/OpenOPC.py "$out/${pythonFull.python.sitePackages}" + cp src/OpenOPC.py "$out/${pythonEnv.python.sitePackages}" cp src/opc.py "$out/libexec/opc/" cat > "$out/bin/opc" << __EOF__ #!${stdenv.shell} - export PYTHONPATH="$out/${pythonFull.python.sitePackages}" - exec ${pythonFull}/bin/${pythonFull.python.executable} "$out/libexec/opc/opc.py" "\$@" + export PYTHONPATH="$out/${pythonEnv.python.sitePackages}" + exec ${pythonEnv}/bin/${pythonEnv.python.executable} "$out/libexec/opc/opc.py" "\$@" __EOF__ chmod a+x "$out/bin/opc" diff --git a/pkgs/tools/misc/venus/default.nix b/pkgs/tools/misc/venus/default.nix index 6fc4e436153f..9f2e4ce8eecb 100644 --- a/pkgs/tools/misc/venus/default.nix +++ b/pkgs/tools/misc/venus/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { doCheck = true; checkPhase = "python runtests.py"; - buildInputs = [ python python.modules.bsddb libxslt + buildInputs = [ python libxslt libxml2 pythonPackages.genshi pythonPackages.lxml makeWrapper ]; installPhase = '' |