kiwix: refactor and fix expression #23525
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
Mar 6, 2017
| @@ -28,6 +28,7 @@ let | |||
| then { tar = xulrunner64_tar; sdk = xulrunnersdk64_tar; } | |||
| else { tar = xulrunner32_tar; sdk = xulrunnersdk32_tar; }; | |||
|
|
|||
| ctpp2 = callPackage ../../../development/libraries/ctpp2 { inherit stdenv; }; | |||
There was a problem hiding this comment.
Sorry I do not understand the purpose of using callPackage here. How is stdenv in this context different?
There was a problem hiding this comment.
From all-packages.nix:
kiwix = callPackage ../applications/misc/kiwix {
stdenv = overrideCC stdenv gcc49;
};
|
Also related to #23253 |
fpletz
approved these changes
Mar 7, 2017
|
kiwix appears to still be broken after this PR? |
|
Graham Christensen <notifications@github.com> writes:
kiwix appears to still be broken after this PR?
error: cannot coerce a set to a string, at /home/grahamc/projects/nixpkgs/pkgs/applications/misc/kiwix/default.nix:64:3
Are you sure?
~~~~
$ git checkout pkg/pretty-kiwix ; nix-build ./default.nix -A kiwix
Already on 'pkg/pretty-kiwix'
Your branch is ahead of 'upstream/master' by 2 commits.
(use "git push" to publish your local commits)
/nix/store/nfpmd21qawljr4m9bykml3ays5b6pb5s-kiwix-0.9
~~~~
Works for me.
|
|
Additional fix in 09d7f7d |
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
OCD. Also doesn't build properly without patching
ctpp2's stdenv.Things done
(nix.useSandbox on NixOS,
or option
build-use-sandboxinnix.confon non-NixOS)
nix-shell -p nox --run "nox-review wip"./result/bin/)