Commit Graph

19 Commits

Author SHA1 Message Date
7c6f434c
8188f10752
Merge pull request #166430 from alyssais/openssl-static-retry
treewide: use lib.getLib for OpenSSL libraries
2022-04-02 12:59:55 +00:00
Alyssa Ross
fd78240ac8
treewide: use lib.getLib for OpenSSL libraries
At some point, I'd like to make another attempt at
71f1f4884b ("openssl: stop static binaries referencing libs"), which
was reverted in 195c7da07d.  One problem with my previous attempt is
that I moved OpenSSL's libraries to a lib output, but many dependent
packages were hardcoding the out output as the location of the
libraries.  This patch fixes every such case I could find in the tree.
It won't have any effect immediately, but will mean these packages
will automatically use an OpenSSL lib output if it is reintroduced in
future.

This patch should cause very few rebuilds, because it shouldn't make
any change at all to most packages I'm touching.  The few rebuilds
that are introduced come from when I've changed a package builder not
to use variable names like openssl.out in scripts / substitution
patterns, which would be confusing since they don't hardcode the
output any more.

I started by making the following global replacements:

    ${pkgs.openssl.out}/lib -> ${lib.getLib pkgs.openssl}/lib
    ${openssl.out}/lib -> ${lib.getLib openssl}/lib

Then I removed the ".out" suffix when part of the argument to
lib.makeLibraryPath, since that function uses lib.getLib internally.

Then I fixed up cases where openssl was part of the -L flag to the
compiler/linker, since that unambigously is referring to libraries.

Then I manually investigated and fixed the following packages:

 - pycurl
 - citrix-workspace
 - ppp
 - wraith
 - unbound
 - gambit
 - acl2

I'm reasonably confindent in my fixes for all of them.

For acl2, since the openssl library paths are manually provided above
anyway, I don't think openssl is required separately as a build input
at all.  Removing it doesn't make a difference to the output size, the
file list, or the closure.

I've tested evaluation with the OfBorg meta checks, to protect against
introducing evaluation failures.
2022-03-30 15:10:00 +00:00
superherointj
54f62a4cb0 prisma-engines: add superherointj as maintainer 2022-03-26 08:33:37 -03:00
Julius de Bruijn
3dcfea557e prisma: 3.10.0 -> 3.11.0 2022-03-15 20:06:33 +01:00
Julius de Bruijn
b10d4e7b74 prisma 3.8.0 -> 3.10.0 2022-02-22 15:28:44 +01:00
Julius de Bruijn
c7de7dbb53 prisma: 3.7.0 -> 3.8.0 2022-01-11 16:45:33 +01:00
Julius de Bruijn
484bdf473d prisma: 3.6.0 -> 3.7.0 2021-12-21 16:32:05 +01:00
Julius de Bruijn
6ef2261581 prisma: 3.5.0 -> 3.6.0 2021-12-07 20:53:42 +01:00
Julius de Bruijn
9951e81c00 prisma: 3.4.0 -> 3.5.0 2021-11-16 14:45:31 +01:00
Julius de Bruijn
db3faeea8e prisma: 3.2.0 -> 3.4.0 2021-11-03 11:06:43 +01:00
Alyssa Ross
851b719ac6 treewide: use stdenv.hostPlatform.extensions.sharedLibrary where appropriate 2021-10-13 17:39:37 +00:00
Julius de Bruijn
d08986bdaf prisma-engines: add support for darwin 2021-10-07 23:10:58 +02:00
Julius de Bruijn
cdaf4b1290 prisma-engines: add support for aarch64-linux 2021-10-07 14:22:16 +02:00
Julius de Bruijn
d04d7c0dc4 prisma: 3.1.1 -> 3.2.0 2021-10-05 17:06:45 +02:00
Julius de Bruijn
5f7019ed8a prisma: 2.30.2 -> 3.1.1 2021-09-25 21:47:30 +09:00
Julius de Bruijn
3bc4a574db prisma: add pimeys as maintainer 2021-09-25 20:38:40 +09:00
Pamplemousse
47557e2984 nodesPackages.prisma: #135934 follow-up corrections 2021-09-25 20:38:40 +09:00
Pamplemousse
d047d336d6 prisma-engines: #135934 follow-up corrections 2021-09-25 20:38:40 +09:00
Pamplemousse
d61ba9863c nodePackages.prisma: init at 2.30.2 2021-09-09 20:42:53 +09:00