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

freetype: Remove unnecessary --disable-static. #66763

Merged

Conversation

nh2
Copy link
Contributor

@nh2 nh2 commented Aug 17, 2019

Motivation for this change

The true-by-default dontDisableStatic already takes care of it.

Fixes freetype not being overridable to have static libs.

This is the most pressing one of the fixes in #66759 (which is for staging, this is for master), because man GUI apps require freetype so it's a big blocker for statically linking them when dontDisableStatic doesn't work due to the hardcode.

Found via nh2/static-haskell-nix#47.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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.
Notify maintainers

cc @ttuegel

cc @matthewbauer @dtzWill @Ericson2314

The true-by-default `dontDisableStatic` already takes care of it.

Fixes freetype not being overridable to have static libs.
@nh2 nh2 requested review from ttuegel and dtzWill August 17, 2019 16:08
nh2 added a commit to nh2/static-haskell-nix that referenced this pull request Aug 17, 2019
Requires nixpkgs submodule update submodule to fix `dontDisableStatic`
not working on `freetype`, see NixOS/nixpkgs#66763.
nh2 added a commit to nh2/static-haskell-nix that referenced this pull request Aug 17, 2019
Requires nixpkgs submodule update submodule to fix `dontDisableStatic`
not working on `freetype`, see NixOS/nixpkgs#66763.
nh2 added a commit to nh2/static-haskell-nix that referenced this pull request Aug 17, 2019
Requires nixpkgs submodule update submodule to fix `dontDisableStatic`
not working on `freetype`, see NixOS/nixpkgs#66763.
@nh2
Copy link
Contributor Author

nh2 commented Aug 17, 2019

Hmm, 10.rebuild-linux: 5001+. Should we do it staging in #66759 instead?

@FRidh FRidh changed the base branch from master to staging September 1, 2019 15:44
@FRidh FRidh merged commit 8c76de9 into NixOS:staging Sep 1, 2019
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 0 This PR does not cause any packages to rebuild and removed 10.rebuild-darwin: 501+ 10.rebuild-darwin: 1001-2500 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ labels Sep 1, 2019
nh2 added a commit to nh2/static-haskell-nix that referenced this pull request Oct 20, 2019
Requires nixpkgs submodule update submodule to fix `dontDisableStatic`
not working on `freetype`, see NixOS/nixpkgs#66763.
nh2 added a commit to nh2/static-haskell-nix that referenced this pull request Oct 20, 2019
Requires nixpkgs submodule update submodule to fix `dontDisableStatic`
not working on `freetype`, see NixOS/nixpkgs#66763.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 0 This PR does not cause any packages to rebuild
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants