diff options
author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2021-07-21 13:34:51 +0200 |
---|---|---|
committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2021-07-21 13:36:40 +0200 |
commit | 0a97ad68276544f9be5e0f79d79c7e515d740421 (patch) | |
tree | 49a85780bb342ba48629948dbd86ebb8b793bcd2 /pkgs/tools | |
parent | 4bc05c6a3021c2186583be346b9aaca9a694e494 (diff) | |
download | nixpkgs-0a97ad68276544f9be5e0f79d79c7e515d740421.tar nixpkgs-0a97ad68276544f9be5e0f79d79c7e515d740421.tar.gz nixpkgs-0a97ad68276544f9be5e0f79d79c7e515d740421.tar.bz2 nixpkgs-0a97ad68276544f9be5e0f79d79c7e515d740421.tar.lz nixpkgs-0a97ad68276544f9be5e0f79d79c7e515d740421.tar.xz nixpkgs-0a97ad68276544f9be5e0f79d79c7e515d740421.tar.zst nixpkgs-0a97ad68276544f9be5e0f79d79c7e515d740421.zip |
brotli: cleanup
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/compression/brotli/default.nix | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index af0cbc4fe22..dfac5af0980 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fetchpatch +{ lib +, stdenv +, fetchFromGitHub +, cmake +, fetchpatch , staticOnly ? stdenv.hostPlatform.isStatic }: @@ -11,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "google"; repo = "brotli"; - rev = "v" + version; + rev = "v${version}"; sha256 = "z6Dhrabav1MDQ4rAcXaDv0aN+qOoh9cvoXZqEWBB13c="; }; @@ -24,8 +28,7 @@ stdenv.mkDerivation rec { sha256 = "sOeXNVsCaBSD9i82GRUDrkyreGeQ7qaJWjjy/uLL0/0="; }); - cmakeFlags = [] - ++ lib.optional staticOnly "-DBUILD_SHARED_LIBS=OFF"; + cmakeFlags = lib.optional staticOnly "-DBUILD_SHARED_LIBS=OFF"; outputs = [ "out" "dev" "lib" ]; @@ -36,13 +39,13 @@ stdenv.mkDerivation rec { # This breaks on Darwin because our cmake hook tries to make a build folder # and the wonderful bazel BUILD file is already there (yay case-insensitivity?) prePatch = '' - rm BUILD + rm BUILD - # Upstream fixed this reference to runtime-path after the release - # and with this references g++ complains about invalid option -R - sed -i 's/ -R''${libdir}//' scripts/libbrotli*.pc.in - cat scripts/libbrotli*.pc.in - ''; + # Upstream fixed this reference to runtime-path after the release + # and with this references g++ complains about invalid option -R + sed -i 's/ -R''${libdir}//' scripts/libbrotli*.pc.in + cat scripts/libbrotli*.pc.in + ''; # Don't bother with "man" output for now, # it currently only makes the manpages hard to use. @@ -53,10 +56,8 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - inherit (src.meta) homepage; - + homepage = "https://github.com/google/brotli"; description = "A generic-purpose lossless compression algorithm and tool"; - longDescription = '' Brotli is a generic-purpose lossless compression algorithm that compresses data using a combination of a modern variant of the LZ77 @@ -69,7 +70,6 @@ stdenv.mkDerivation rec { in the following internet draft: http://www.ietf.org/id/draft-alakuijala-brotli ''; - license = licenses.mit; maintainers = with maintainers; [ freezeboy ]; platforms = platforms.all; |