Skip to content

Commit

Permalink
diffoscope: Don't propagate build inputs
Browse files Browse the repository at this point in the history
This reduces the runtime closure size from 297 to 132 MiB.
  • Loading branch information
edolstra committed Mar 20, 2017
1 parent 4e54611 commit 96d7f35
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion pkgs/tools/misc/diffoscope/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,13 @@ python3.pkgs.buildPythonApplication rec {
# Still missing these tools: enjarify, otool & lipo (maybe OS X only), showttf
# Also these libraries: python3-guestfs
# FIXME: move xxd into a separate package so we don't have to pull in all of vim.
propagatedBuildInputs = (with python3.pkgs; [ debian libarchive-c python_magic tlsh rpm ]) ++
buildInputs =
map lib.getBin ([ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext
gzip libcaca poppler_utils sng sqlite squashfsTools unzip vim xz colordiff
] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]);

pythonPath = with python3.pkgs; [ debian libarchive-c python_magic tlsh rpm ];

doCheck = false; # Calls 'mknod' in squashfs tests, which needs root

postInstall = ''
Expand Down

2 comments on commit 96d7f35

@dezgeg
Copy link
Contributor

@dezgeg dezgeg commented on 96d7f35 Mar 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The intent of the propagatedBuildInputs here was to cause the command-line tools to be added to the PATH by the wrapPythonPackage. I don't think adding to buildInputs has the same effect.

@FRidh
Copy link
Member

@FRidh FRidh commented on 96d7f35 Mar 22, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dezgeg correct, wrapPythonPrograms checks pythonPath and nix-support/propagated-native-build-inputs, not buildInputs.

Please sign in to comment.