diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-03-22 20:39:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-22 20:39:30 -0500 |
| commit | d23d44374fa5407fb0b00815c58a283bd1ee2cd8 (patch) | |
| tree | cbf9d481bc74ce3eb5726e716d0a1566dc8981a4 /pkgs/os-specific | |
| parent | 7a77439b03ba2b0b1967b9f9b9c556719a9a25f4 (diff) | |
| parent | 4f3c212696d5b54c0df376a3cd2f16e7791aecd8 (diff) | |
| download | nixlib-d23d44374fa5407fb0b00815c58a283bd1ee2cd8.tar nixlib-d23d44374fa5407fb0b00815c58a283bd1ee2cd8.tar.gz nixlib-d23d44374fa5407fb0b00815c58a283bd1ee2cd8.tar.bz2 nixlib-d23d44374fa5407fb0b00815c58a283bd1ee2cd8.tar.lz nixlib-d23d44374fa5407fb0b00815c58a283bd1ee2cd8.tar.xz nixlib-d23d44374fa5407fb0b00815c58a283bd1ee2cd8.tar.zst nixlib-d23d44374fa5407fb0b00815c58a283bd1ee2cd8.zip | |
Merge pull request #37012 from matthewbauer/libintl-sanity
Make "localizations" sane again
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/policycoreutils/default.nix | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix index 13b6156492bb..d9b3dfb74049 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix @@ -14,6 +14,8 @@ appleDerivation { -Wl,-reexport_library -Wl,$out/lib/libcharset.dylib ''; + setup-hook = ../../../../development/libraries/libiconv/setup-hook.sh; + meta = { platforms = stdenv.lib.platforms.darwin; }; diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/os-specific/linux/policycoreutils/default.nix index 536c69ff5573..980b77f8df24 100644 --- a/pkgs/os-specific/linux/policycoreutils/default.nix +++ b/pkgs/os-specific/linux/policycoreutils/default.nix @@ -65,4 +65,3 @@ stdenv.mkDerivation rec { inherit (libsepol.meta) homepage platforms maintainers; }; } - |