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
base: cf47ba66fb65
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 70cfd9d25e1d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 15, 2020

  1. tk: fix build on darwin 

    Installing libtk on macOS 10.15.5 resulted in a following warning:

    warning: skipping dangling symlink '/nix/store/3whl4256v6qf15dsm1d5mf0lzhfh6w06-user-environment/lib/libtk.so'

which was caused by the following code in generic.nix of the tk derivation:

    ln -s $out/lib/libtk${super.tcl.release}.so $out/lib/libtk.so

Shared libraries on macOS are suffixed `.dylib' not 'so' so
libtk${version}.so does not actually exist. Consequently a symlink from
libtk.dylib is never created and linking against tk fails.
    @hannesweisbach @marsam
    hannesweisbach authored and marsam committed Aug 15, 2020
    Copy the full SHA
    371e262 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2020

  1. Merge pull request #95510 from hannesweisbach/patch-1 

    tk: fix installation on macOS
    @marsam
    marsam committed Aug 23, 2020
    Copy the full SHA
    70cfd9d View commit details
    Browse the repository at this point in the history