Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c787301e9efa
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 201d9b8916dd
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 17, 2020

  1. zopfli: 1.0.2 -> 1.0.3

    @ajs124
    ajs124 committed Jan 17, 2020
    Copy the full SHA
    782ea12 View commit details

Commits on Jan 18, 2020

  1. Merge pull request #77956 from helsinki-systems/upd/zopfli 

    zopfli: 1.0.2 -> 1.0.3
    @edef1c
    edef1c authored Jan 18, 2020
    Copy the full SHA
    201d9b8 View commit details
Showing with 3 additions and 14 deletions.
  1. +3 −14 pkgs/tools/compression/zopfli/default.nix
17 changes: 3 additions & 14 deletions pkgs/tools/compression/zopfli/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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*
'';