diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-03 10:05:50 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-04 10:45:22 +0100 |
commit | 0a2caa41fe0da9e5c36f47994594650f00e1d111 (patch) | |
tree | e7b9a6f88de8a8c3ee71ed65b2d9257836f9a3a0 /pkgs/tools/networking/unbound | |
parent | f665828fa374580f4b2fd725761d23e18f55e526 (diff) | |
download | nixlib-0a2caa41fe0da9e5c36f47994594650f00e1d111.tar nixlib-0a2caa41fe0da9e5c36f47994594650f00e1d111.tar.gz nixlib-0a2caa41fe0da9e5c36f47994594650f00e1d111.tar.bz2 nixlib-0a2caa41fe0da9e5c36f47994594650f00e1d111.tar.lz nixlib-0a2caa41fe0da9e5c36f47994594650f00e1d111.tar.xz nixlib-0a2caa41fe0da9e5c36f47994594650f00e1d111.tar.zst nixlib-0a2caa41fe0da9e5c36f47994594650f00e1d111.zip |
Python: drop `python.majorVersion`
Drop `python.majorVersion`. For Python language version, use `python.pythonVersion`. For implementation version, use `python.sourceVersion`. Some expressions were broken. Those that were identified were fixed. fixup major
Diffstat (limited to 'pkgs/tools/networking/unbound')
-rw-r--r-- | pkgs/tools/networking/unbound/python.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/networking/unbound/python.nix b/pkgs/tools/networking/unbound/python.nix index 67e6f2e9c43f..c20169d39135 100644 --- a/pkgs/tools/networking/unbound/python.nix +++ b/pkgs/tools/networking/unbound/python.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { --replace "\$(LIBTOOL) --mode=install cp _unbound.la" "cp _unbound.la" ''; - preConfigure = "export PYTHON_VERSION=${python.majorVersion}"; + preConfigure = "export PYTHON_VERSION=${python.pythonVersion}"; configureFlags = [ "--with-ssl=${openssl.dev}" @@ -46,13 +46,13 @@ in stdenv.mkDerivation rec { # All we want is the Unbound Python module postInstall = '' - # Generate the built in root anchor and root key and store these in a logical place + # Generate the built in root anchor and root key and store these in a logical place # to be used by tools depending only on the Python module $out/bin/unbound-anchor -l | head -1 > $out/etc/${pname}/root.anchor $out/bin/unbound-anchor -l | tail --lines=+2 - > $out/etc/${pname}/root.key # We don't need anything else rm -fR $out/bin $out/share $out/include $out/etc/unbound - patchelf --replace-needed libunbound.so.2 $out/${python.sitePackages}/libunbound.so.2 $out/${python.sitePackages}/_unbound.so + patchelf --replace-needed libunbound.so.2 $out/${python.sitePackages}/libunbound.so.2 $out/${python.sitePackages}/_unbound.so ''; meta = with stdenv.lib; { |