diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-04-20 23:47:17 -0400 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-04-20 23:49:02 -0400 |
| commit | c450617f99ede98b7641eb77e60b17ca1812dbb8 (patch) | |
| tree | ff20d8f7344eea2266ffb09bb4233dac47a8e03e /pkgs | |
| parent | 3e880bad79d2cef9afc02db6d635e30479f18418 (diff) | |
| download | nixpkgs-c450617f99ede98b7641eb77e60b17ca1812dbb8.tar nixpkgs-c450617f99ede98b7641eb77e60b17ca1812dbb8.tar.gz nixpkgs-c450617f99ede98b7641eb77e60b17ca1812dbb8.tar.bz2 nixpkgs-c450617f99ede98b7641eb77e60b17ca1812dbb8.tar.lz nixpkgs-c450617f99ede98b7641eb77e60b17ca1812dbb8.tar.xz nixpkgs-c450617f99ede98b7641eb77e60b17ca1812dbb8.tar.zst nixpkgs-c450617f99ede98b7641eb77e60b17ca1812dbb8.zip | |
bintools-wrapper: only propagate .info output if it exists in the original
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/build-support/bintools-wrapper/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 84020505a63..5cc99c6412a 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation { inherit targetPrefix infixSalt; - outputs = [ "out" ] ++ optionals propagateDoc [ "man" "info" ]; + outputs = [ "out" ] ++ optionals propagateDoc ([ "man" ] ++ optional (bintools ? info) "info"); passthru = { inherit bintools libc nativeTools nativeLibc nativePrefix; @@ -259,14 +259,15 @@ stdenv.mkDerivation { printWords ${bintools_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages '' - + optionalString propagateDoc '' + + optionalString propagateDoc ('' ## ## Man page and info support ## ln -s ${bintools.man} $man + '' + optionalString (bintools ? info) '' ln -s ${bintools.info} $info - '' + '') + '' ## |