From 8796a2e176a871ecf993283e15ce888d1131104d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 3 Mar 2021 15:05:04 +0100 Subject: [PATCH] squashfs: cleanup, update homepage --- pkgs/tools/filesystems/squashfs/default.nix | 34 +++++++++++++-------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index 3c38341554a5..cddb1722584b 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -1,19 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, zlib, xz +{ lib +, stdenv +, fetchFromGitHub +, zlib +, xz , lz4 , lzo , zstd }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "squashfs"; version = "4.4"; src = fetchFromGitHub { owner = "plougher"; repo = "squashfs-tools"; + rev = version; sha256 = "0697fv8n6739mcyn57jclzwwbbqwpvjdfkv1qh9s56lvyqnplwaw"; - # Tag "4.4" points to this commit. - rev = "52eb4c279cd283ed9802dd1ceb686560b22ffb67"; }; patches = [ @@ -28,17 +31,24 @@ stdenv.mkDerivation { buildInputs = [ zlib xz zstd lz4 lzo ]; - preBuild = "cd squashfs-tools"; + preBuild = '' + cd squashfs-tools + '' ; - installFlags = [ "INSTALL_DIR=\${out}/bin" ]; + installFlags = [ "INSTALL_DIR=${placeholder "out"}/bin" ]; - makeFlags = [ "XZ_SUPPORT=1" "ZSTD_SUPPORT=1" "LZ4_SUPPORT=1" "LZO_SUPPORT=1"]; + makeFlags = [ + "XZ_SUPPORT=1" + "ZSTD_SUPPORT=1" + "LZ4_SUPPORT=1" + "LZO_SUPPORT=1" + ]; - meta = { - homepage = "http://squashfs.sourceforge.net/"; + meta = with lib; { + homepage = "https://github.com/plougher/squashfs-tools"; description = "Tool for creating and unpacking squashfs filesystems"; - platforms = lib.platforms.unix; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ ruuda ]; + platforms = platforms.unix; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ruuda ]; }; }