Skip to content

libpsl: fix static build (fixes nixStatic) #335458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
philiptaron merged 1 commit into from
Aug 17, 2024
Merged

libpsl: fix static build (fixes nixStatic) #335458

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions pkgs/development/libraries/libpsl/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
};

# bin/psl-make-dafsa brings a large runtime closure through python3
outputs = [ "bin" "out" "dev" ];
outputs = lib.optional (!stdenv.hostPlatform.isStatic) "bin" ++ [ "out" "dev" ];
Copy link
Member

@SuperSandro2000 SuperSandro2000 Aug 18, 2024

Choose a reason for hiding this comment

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

This is not great as the default output for static is now a different one.

Copy link
Contributor

@philiptaron philiptaron Aug 18, 2024

Choose a reason for hiding this comment

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

Yes, but this way avoids rebuilds. Send a PR for the right change, as you see it?

Copy link
Member

@SuperSandro2000 SuperSandro2000 Aug 23, 2024

Choose a reason for hiding this comment

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

#336884


nativeBuildInputs = [
autoreconfHook
Expand All @@ -40,14 +40,13 @@ stdenv.mkDerivation rec {
libidn2
libunistring
libxslt
python3
];
] ++ lib.optional (!stdenv.hostPlatform.isStatic) python3;

propagatedBuildInputs = [
publicsuffix-list
];

postPatch = ''
postPatch = lib.optionalString (!stdenv.hostPlatform.isStatic) ''
patchShebangs src/psl-make-dafsa
'';

Expand Down