diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2020-01-28 14:54:51 +0100 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2020-01-28 14:54:51 +0100 |
| commit | 6b0cd9ad47f47e5cd32153304afc5ae7dc3f5d58 (patch) | |
| tree | 598dbc9d1c5fe646e9c74265799aa8da5a913b3c /pkgs/tools/compression | |
| parent | b7574e08a007ac150ef8be266bff4edd69ebe32b (diff) | |
| parent | cdff57e1fca1bace8385e53ea7c4e17599ee5a8e (diff) | |
| download | nixpkgs-6b0cd9ad47f47e5cd32153304afc5ae7dc3f5d58.tar nixpkgs-6b0cd9ad47f47e5cd32153304afc5ae7dc3f5d58.tar.gz nixpkgs-6b0cd9ad47f47e5cd32153304afc5ae7dc3f5d58.tar.bz2 nixpkgs-6b0cd9ad47f47e5cd32153304afc5ae7dc3f5d58.tar.lz nixpkgs-6b0cd9ad47f47e5cd32153304afc5ae7dc3f5d58.tar.xz nixpkgs-6b0cd9ad47f47e5cd32153304afc5ae7dc3f5d58.tar.zst nixpkgs-6b0cd9ad47f47e5cd32153304afc5ae7dc3f5d58.zip | |
Merge branch 'staging' into glibc230
Conflicts: pkgs/applications/misc/vit/default.nix
Diffstat (limited to 'pkgs/tools/compression')
| -rw-r--r-- | pkgs/tools/compression/zopfli/default.nix | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/pkgs/tools/compression/zopfli/default.nix b/pkgs/tools/compression/zopfli/default.nix index accead9db0b..586c47de582 100644 --- a/pkgs/tools/compression/zopfli/default.nix +++ b/pkgs/tools/compression/zopfli/default.nix @@ -2,32 +2,21 @@ stdenv.mkDerivation rec { pname = "zopfli"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "google"; repo = "zopfli"; rev = "${pname}-${version}"; name = "${pname}-${version}-src"; - sha256 = "1l551hx2p4qi0w9lk96qklbv6ll68gxbah07fhqx1ly28rv5wy9y"; + sha256 = "0dr8n4j5nj2h9n208jns56wglw59gg4qm3s7c6y3hs75d0nnkhm4"; }; - patches = [ - (fetchpatch { - name = "zopfli-cmake.patch"; - url = "https://github.com/google/zopfli/commit/7554e4d34e7000b0595aa606e7d72357cf46ba86.patch"; - sha256 = "1pvfhir2083v1l042a4dy5byqdmad7sxnd4jrprl2hzzb2avxbbn"; - }) - ]; - nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON" ]; - installPhase = '' - install -D -t $out/bin zopfli* - install -d $out/lib - cp -d libzopfli* $out/lib + postInstall = '' install -Dm444 -t $out/share/doc/zopfli ../README* ''; |