mirror of
				https://github.com/9001/copyparty.git
				synced 2025-11-03 21:43:12 +00:00 
			
		
		
		
	fix: disable use of aliases in nixpkgs
This enables compatibility with users who also disable aliases
The utillinux alias was added in 2020[1], which is older than the previous
Nixpkgs pin, which means we can safely switch to the non-aliased version.
1: 3896a0c0e2/pkgs/top-level/aliases.nix (L1967)
			
			
This commit is contained in:
		@@ -1,4 +1,4 @@
 | 
			
		||||
{ lib, stdenv, makeWrapper, fetchurl, utillinux, python, jinja2, impacket, pyftpdlib, pyopenssl, argon2-cffi, pillow, pyvips, pyzmq, ffmpeg, mutagen,
 | 
			
		||||
{ lib, stdenv, makeWrapper, fetchurl, util-linux, python, jinja2, impacket, pyftpdlib, pyopenssl, argon2-cffi, pillow, pyvips, pyzmq, ffmpeg, mutagen,
 | 
			
		||||
 | 
			
		||||
# use argon2id-hashed passwords in config files (sha2 is always available)
 | 
			
		||||
withHashedPasswords ? true,
 | 
			
		||||
@@ -61,7 +61,7 @@ in stdenv.mkDerivation {
 | 
			
		||||
  installPhase = ''
 | 
			
		||||
    install -Dm755 $src $out/share/copyparty-sfx.py
 | 
			
		||||
    makeWrapper ${pyEnv.interpreter} $out/bin/copyparty \
 | 
			
		||||
      --set PATH '${lib.makeBinPath ([ utillinux ] ++ lib.optional withMediaProcessing ffmpeg)}:$PATH' \
 | 
			
		||||
      --set PATH '${lib.makeBinPath ([ util-linux ] ++ lib.optional withMediaProcessing ffmpeg)}:$PATH' \
 | 
			
		||||
      --add-flags "$out/share/copyparty-sfx.py"
 | 
			
		||||
  '';
 | 
			
		||||
  meta.mainProgram = "copyparty";
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user