diff options
author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2023-03-24 01:30:46 +0100 |
---|---|---|
committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2024-01-30 19:56:57 +0100 |
commit | 653837881ed2a27a12c7bf662be4abe9db9b7cc5 (patch) | |
tree | b9423fa35443b64d1ed1f1c511c049f42f746d2b /pkgs/tools | |
parent | 30b34ac00788d0dce98a992b6d92779b9eb6bc19 (diff) | |
download | nixlib-653837881ed2a27a12c7bf662be4abe9db9b7cc5.tar nixlib-653837881ed2a27a12c7bf662be4abe9db9b7cc5.tar.gz nixlib-653837881ed2a27a12c7bf662be4abe9db9b7cc5.tar.bz2 nixlib-653837881ed2a27a12c7bf662be4abe9db9b7cc5.tar.lz nixlib-653837881ed2a27a12c7bf662be4abe9db9b7cc5.tar.xz nixlib-653837881ed2a27a12c7bf662be4abe9db9b7cc5.tar.zst nixlib-653837881ed2a27a12c7bf662be4abe9db9b7cc5.zip |
treewide: replace `lib/${python.libPrefix}/site-packages` with its shorthand `${python.sitePackages}`
which should be always preferred
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/admin/gam/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/audio/tts/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/debian-devscripts/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/security/arubaotp-seed-extractor/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/security/hash-slinger/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/security/pass/extensions/audit/default.nix | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/tools/admin/gam/default.nix b/pkgs/tools/admin/gam/default.nix index 6ea2b6c3da37..6cf340150ffb 100644 --- a/pkgs/tools/admin/gam/default.nix +++ b/pkgs/tools/admin/gam/default.nix @@ -52,8 +52,8 @@ python3.pkgs.buildPythonApplication rec { runHook preInstall mkdir -p $out/bin cp gam.py $out/bin/gam - mkdir -p $out/lib/${python3.libPrefix}/site-packages - cp -r gam $out/lib/${python3.libPrefix}/site-packages + mkdir -p $out/${python3.sitePackages} + cp -r gam $out/${python3.sitePackages} runHook postInstall ''; diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index 48c936ca632f..d761e4605190 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -128,7 +128,7 @@ python.pkgs.buildPythonApplication rec { for file in $(grep -rl 'python TTS/bin' tests); do substituteInPlace "$file" \ - --replace "python TTS/bin" "${python.interpreter} $out/lib/${python.libPrefix}/site-packages/TTS/bin" + --replace "python TTS/bin" "${python.interpreter} $out/${python.sitePackages}/TTS/bin" done ''; diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index b8a58ff400e2..d70994753dbd 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { preConfigure = '' export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${dpkg}"; - tgtpy="$out/lib/${python.libPrefix}/site-packages" + tgtpy="$out/${python.sitePackages}" mkdir -p "$tgtpy" export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$tgtpy" find lib po4a scripts -type f -exec sed -r \ diff --git a/pkgs/tools/security/arubaotp-seed-extractor/default.nix b/pkgs/tools/security/arubaotp-seed-extractor/default.nix index a1ab0fd9f290..c2ffef83635d 100644 --- a/pkgs/tools/security/arubaotp-seed-extractor/default.nix +++ b/pkgs/tools/security/arubaotp-seed-extractor/default.nix @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication { ]; installPhase = '' - libdir="$out/lib/${python3Packages.python.libPrefix}/site-packages/arubaotp-seed-extractor" + libdir="$out/${python3Packages.python.sitePackages}/arubaotp-seed-extractor" mkdir -p "$libdir" cp scripts/* "$libdir" chmod +x "$libdir/main.py" diff --git a/pkgs/tools/security/hash-slinger/default.nix b/pkgs/tools/security/hash-slinger/default.nix index 0f0eeeb6b2af..cb02b806a986 100644 --- a/pkgs/tools/security/hash-slinger/default.nix +++ b/pkgs/tools/security/hash-slinger/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/bin $out/man $out/lib/${python3.libPrefix}/site-packages + mkdir -p $out/bin $out/man $out/${python3.sitePackages} make install wrapPythonPrograms ''; diff --git a/pkgs/tools/security/pass/extensions/audit/default.nix b/pkgs/tools/security/pass/extensions/audit/default.nix index 74e9dab46a7e..365f81759cce 100644 --- a/pkgs/tools/security/pass/extensions/audit/default.nix +++ b/pkgs/tools/security/pass/extensions/audit/default.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { installFlags = [ "DESTDIR=${placeholder "out"}" "PREFIX=" ]; postInstall = '' wrapProgram $out/lib/password-store/extensions/audit.bash \ - --prefix PYTHONPATH : "$out/lib/${pythonEnv.libPrefix}/site-packages" \ + --prefix PYTHONPATH : "$out/${pythonEnv.sitePackages}" \ --run "export COMMAND" ''; |