Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

zopfli: split outputs #79251

Merged
merged 2 commits into from Feb 10, 2020
Merged

zopfli: split outputs #79251

merged 2 commits into from Feb 10, 2020

Conversation

edef1c
Copy link
Member

@edef1c edef1c commented Feb 5, 2020

Motivation for this change

Linking to libzopfli shouldn't necessarily bring along the zopfli CLI tool.

Alternatives

The zopfli and zopflipng CLI tools are fairly tiny, and including them doesn't cost much space.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@bobvanderlinden
Copy link
Member

I might not be up-to-speed with how outputs are working, but I thought they should be referred to in the installPhase. Currently the lib of zopfli isn't installed at all.

https://github.com/NixOS/nixpkgs/pull/79251/files#diff-bd5c76634c2d7bd165f14613734e6bfaR21

@edef1c
Copy link
Member Author

edef1c commented Feb 5, 2020

Currently the lib of zopfli isn't installed at all.

I'm having trouble reproducing that:

edef@vixen ~/s/nixpkgs> tree /nix/store/5wh8m3i7mb9hgwbf810fi7diji35k20j-zopfli-1.0.3-dev /nix/store/96l55cy1b3ry529wms1yzn9xmgisx3ja-zopfli-1.0.3-lib /nix/store/cj8knh33w0mwbaskwmia1x7bbf4giwx0-zopfli-1.0.3
/nix/store/5wh8m3i7mb9hgwbf810fi7diji35k20j-zopfli-1.0.3-dev
├── include
│   ├── zopfli.h
│   └── zopflipng_lib.h
├── lib
│   └── cmake
│       └── Zopfli
│           ├── ZopfliConfig.cmake
│           ├── ZopfliConfig-release.cmake
│           └── ZopfliConfigVersion.cmake
└── nix-support
    └── propagated-build-inputs
/nix/store/96l55cy1b3ry529wms1yzn9xmgisx3ja-zopfli-1.0.3-lib
└── lib
    ├── libzopflipng.so -> libzopflipng.so.1
    ├── libzopflipng.so.1 -> libzopflipng.so.1.0.3
    ├── libzopflipng.so.1.0.3
    ├── libzopfli.so -> libzopfli.so.1
    ├── libzopfli.so.1 -> libzopfli.so.1.0.3
    └── libzopfli.so.1.0.3
/nix/store/cj8knh33w0mwbaskwmia1x7bbf4giwx0-zopfli-1.0.3
├── bin
│   ├── zopfli
│   └── zopflipng
└── share
    └── doc
        └── zopfli
            ├── README
            └── README.zopflipng

@FRidh FRidh merged commit 08e96d2 into NixOS:master Feb 10, 2020
@edef1c edef1c deleted the zopfli-split-outputs branch February 13, 2020 10:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants