Unverified Commit addd85b5 authored by Yueh-Shun Li's avatar Yueh-Shun Li Committed by GitHub
Browse files

buildEnv: allow spaces in pathsToLink (#451871)

parents 0f767d37 fbe21443

pkgs/build-support/buildenv/builder.pl

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ $SIG{__DIE__} = sub { die "pkgs.buildEnv error: ", @_ }; 
my $out = $ENV{"out"};

my $extraPrefix = $ENV{"extraPrefix"};



my @pathsToLink = split ' ', $ENV{"pathsToLink"};

my @pathsToLink = @{decode_json $ENV{"pathsToLinkJSON"}};



sub isInPathsToLink($path) {

    $path = "/" if $path eq "";

pkgs/build-support/buildenv/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ lib.makeOverridable ( 
          nativeBuildInputs

          buildInputs

          ;

        pathsToLinkJSON = builtins.toJSON pathsToLink;

        pkgs = builtins.toJSON chosenOutputs;

        extraPathsFrom = lib.optional includeClosures (writeClosure pathsForClosure);

        preferLocalBuild = true;