doas: drop patch, use dontAddStaticConfigureFlags instead#236184
Conversation
The configure script that comes with doas does not understand `--disable-shared`, which nixpkgs sometimes adds to `configureFlags`. Previously, doas included a patch that would cause its configure script to ignore this flag instead of rejecting it. This commit drops that patch and instead uses `dontAddStaticConfigureFlags=false` (introduced in b0b5ef7) to prevent nixpkgs addingn `--disable-shared` to doas' configureFlags.
cole-h
approved these changes
Jun 6, 2023
Member
cole-h
left a comment
There was a problem hiding this comment.
pkgs.doas and pkgsStatic.doas both build fine, thanks!
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Description of changes
The configure script that comes with doas does not understand
--disable-shared, which nixpkgs sometimes adds toconfigureFlags.Previously, doas included a patch that would cause its configure script to ignore this flag instead of rejecting it. This commit drops that patch and instead uses
dontAddStaticConfigureFlags=false(introduced in b0b5ef7) to prevent nixpkgs adding--disable-sharedto doas' configureFlags.Things done
./result/bin/)