Merge pull request #153478 from vlaci/lziprecover

authored by Sandro and committed by GitHub cdb20df8 0693fd77

+38 -4
+5 -4
pkgs/tools/compression/lzip/default.nix
··· 20 20 "CPPFLAGS=-DNDEBUG" 21 21 "CFLAGS=-O3" 22 22 "CXXFLAGS=-O3" 23 - ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) 24 - "CXX=${stdenv.cc.targetPrefix}c++"; 23 + "CXX=${stdenv.cc.targetPrefix}c++" 24 + ]; 25 25 26 26 setupHook = ./lzip-setup-hook.sh; 27 27 28 28 doCheck = true; 29 29 enableParallelBuilding = true; 30 30 31 - meta = { 31 + meta = with lib; { 32 32 homepage = "https://www.nongnu.org/lzip/lzip.html"; 33 33 description = "A lossless data compressor based on the LZMA algorithm"; 34 - license = lib.licenses.gpl3Plus; 34 + license = lib.licenses.gpl2Plus; 35 + maintainers = with maintainers; [ vlaci ]; 35 36 platforms = lib.platforms.all; 36 37 }; 37 38 }
+31
pkgs/tools/compression/lziprecover/default.nix
··· 1 + { lib, stdenv, fetchurl, lzip }: 2 + 3 + stdenv.mkDerivation rec { 4 + pname = "lziprecover"; 5 + version = "1.22"; 6 + 7 + src = fetchurl { 8 + url = "mirror://savannah/lzip/lziprecover/${pname}-${version}.tar.gz"; 9 + sha256 = "sha256-/ZWKCXX3cpxE87eE5WaJH3NsPcaDdNvSFJ7mkqFtCGI="; 10 + }; 11 + 12 + configureFlags = [ 13 + "CPPFLAGS=-DNDEBUG" 14 + "CFLAGS=-O3" 15 + "CXXFLAGS=-O3" 16 + "CXX=${stdenv.cc.targetPrefix}c++" 17 + ]; 18 + 19 + doCheck = true; 20 + checkInputs = [ lzip ]; 21 + 22 + enableParallelBuilding = true; 23 + 24 + meta = with lib; { 25 + homepage = "https://www.nongnu.org/lzip/lziprecover.html"; 26 + description = "Data recovery tool for lzip compressed files"; 27 + license = lib.licenses.gpl2Plus; 28 + maintainers = with maintainers; [ vlaci ]; 29 + platforms = lib.platforms.all; 30 + }; 31 + }
+2
pkgs/top-level/all-packages.nix
··· 7577 7577 7578 7578 lzip = callPackage ../tools/compression/lzip { }; 7579 7579 7580 + lziprecover = callPackage ../tools/compression/lziprecover { }; 7581 + 7580 7582 luxcorerender = callPackage ../tools/graphics/luxcorerender { 7581 7583 openimagedenoise = openimagedenoise_1_2_x; 7582 7584 };