diff options
author | Jan Malakhovski <oxij@oxij.org> | 2018-05-26 00:20:17 +0000 |
---|---|---|
committer | Jan Malakhovski <oxij@oxij.org> | 2018-05-26 00:20:17 +0000 |
commit | ad35019501e6b263e08ecb4c66f1ee6e3eee80f1 (patch) | |
tree | 492149cd4a5da50945a5bc7d5fa62de432590dea /pkgs/tools/misc | |
parent | 98f2f08b4b9b204912c1c097a08cd26151fae0bb (diff) | |
parent | 97e376bf9cafa2d6c812221677f2e38163d0acb8 (diff) | |
download | nixlib-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar nixlib-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar.gz nixlib-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar.bz2 nixlib-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar.lz nixlib-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar.xz nixlib-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar.zst nixlib-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.zip |
Merge branch 'master' into staging
Fixed conflicts: - lib/systems/for-meta.nix: in favor of staging - pkgs/os-specific/darwin/xcode/default.nix: in favor of master
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/parted/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 3a05a1927dbc..0a0cece4fce6 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1r3qpg3bhz37mgvp9chsaa3k0csby3vayfvz8ggsqz194af5i2w5"; }; + outputs = [ "out" "dev" "man" "info" ]; + patches = stdenv.lib.optional doCheck ./gpt-unicode-test-fix.patch ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { |