pstoedit,plotutils: fix for darwin and mark not broken #22196
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
|
@jbaum98, thanks for your PR! By analyzing the history of the files in this pull request, we identified @edolstra, @MarcWeber and @joachifm to be potential reviewers. |
globin
requested changes
Jan 27, 2017
|
|
||
| meta = with stdenv.lib; { | ||
| description = "Translates PostScript and PDF graphics into other vector formats"; | ||
| homepage = https://sourceforge.net/projects/pstoedit/; | ||
| license = licenses.gpl2; | ||
| maintainers = [ maintainers.marcweber ]; | ||
| platforms = platforms.linux; |
There was a problem hiding this comment.
Don't remove this line, change it to platforms.unix
| @@ -13,13 +13,14 @@ stdenv.mkDerivation rec { | |||
|
|
|||
| outputs = [ "out" "dev" ]; | |||
| nativeBuildInputs = [ pkgconfig ]; | |||
| buildInputs = [ zlib ghostscript imagemagick plotutils gd libjpeg libwebp ]; | |||
| buildInputs = [ zlib ghostscript imagemagick plotutils gd libjpeg libwebp libiconv ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ | |||
There was a problem hiding this comment.
I'd prefer having this line wrapped earlier
| @@ -52,6 +52,5 @@ stdenv.mkDerivation rec { | |||
|
|
|||
| license = stdenv.lib.licenses.gpl2Plus; | |||
| maintainers = [ stdenv.lib.maintainers.marcweber ]; | |||
| platforms = stdenv.lib.platforms.gnu; | |||
There was a problem hiding this comment.
Don't remove this line, change it to platforms.unix
|
@globin thanks for the suggestions, I made those changes and pushed a new commit. |
LnL7
reviewed
Feb 5, 2017
| @@ -13,13 +13,16 @@ stdenv.mkDerivation rec { | |||
|
|
|||
| outputs = [ "out" "dev" ]; | |||
| nativeBuildInputs = [ pkgconfig ]; | |||
| buildInputs = [ zlib ghostscript imagemagick plotutils gd libjpeg libwebp ]; | |||
| buildInputs = [ zlib ghostscript imagemagick plotutils gd libjpeg libwebp libiconv ] | |||
LnL7
approved these changes
Feb 7, 2017
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
pstoedit and plotutils were marked broken for darwin, and pstoedit was not compiling due to a missing dependency on ApplicationServices.
Things done
(nix.useSandbox on NixOS,
or option
build-use-sandboxinnix.confon non-NixOS)
nix-shell -p nox --run "nox-review wip"./result/bin/)