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: ee08469d6cf4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8322b43e8e7b
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 2, 2018

  1. Revert "darwin.libiconv: fix setup hook" 

    This reverts commit ee08469.

This one should go in staging first.
    @matthewbauer
    matthewbauer committed May 2, 2018
    Copy the full SHA
    8322b43 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
2 changes: 1 addition & 1 deletion pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ appleDerivation {
-Wl,-reexport_library -Wl,$out/lib/libcharset.dylib
'';

setupHook = ../../../../development/libraries/libiconv/setup-hook.sh;
setup-hook = ../../../../development/libraries/libiconv/setup-hook.sh;

meta = {
platforms = stdenv.lib.platforms.darwin;