opencryptoki, pkcs11-helper, simple-tpm-pk11 #31573
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Mic92
reviewed
Nov 13, 2017
| --replace "groupadd" "true" \ | ||
| --replace "chmod" "true" \ | ||
| --replace "chgrp" "true" | ||
| substituteInPlace usr/lib/Makefile.am --replace "DESTDIR" "out" |
There was a problem hiding this comment.
is it possible to replace this substitute by makeFlags = ["DESTDIR=$(out)"];? I have not looked at the code.
There was a problem hiding this comment.
It's what the previous definition was doing but it is actually needed only for installing "/etc/ld.so.conf.d/opencryptoki-xxx.conf" under $out.
Using DESTDIR=$(out) messes up the the arborescence of everything else (it installs under /nix/store/hash-opencryptoki/nix/store/hash-opencryptoki ...) and you end up with having to do that ugly cp -r $out/$out/* $out in postInstall.
Plus I'm pretty sure the path in .la files were wrong. I'd have to double-check on that. no they are good
|
Just completed a nox-review successfully on nixos-17.09: Result in /tmp/nox-review-hg7punxr
total 16
lrwxrwxrwx 1 demo users 62 Nov 14 15:29 result -> /nix/store/wbxylsxdhszwbr48kykwk3xy4xcm2dxy-pkcs11-helper-1.22
lrwxrwxrwx 1 demo users 56 Nov 14 15:29 result-2 -> /nix/store/4727g7ng70zclff0harv8rshnx12rhhk-meo-20121113
lrwxrwxrwx 1 demo users 62 Nov 14 15:29 result-3 -> /nix/store/zi7vzrk5s6n7mkiyk9dp2mlqqyh2dqnk-opencryptoki-3.8.1
lrwxrwxrwx 1 demo users 61 Nov 14 15:29 result-4 -> /nix/store/4sjlc4k1sl42as6dlmrl7lmmwh5x4lbi-tpm-tools-1.3.9.1
lrwxrwxrwx 1 demo users 64 Nov 14 15:29 result-5 -> /nix/store/nmiihs4cfsjv88bcs1vlvjhcdcbcqdsy-simple-tpm-pk11-0.06 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Refresh of unattended packages loosely related
Plus homepages refresh (#30636)
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)