sdcv: 0.4.2 -> 0.5.2 #31493
Merged
sdcv: 0.4.2 -> 0.5.2 #31493
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
c0bw3b
requested changes
Nov 10, 2017
| @@ -1,7 +1,9 @@ | |||
| { stdenv, fetchurl, pkgconfig, glib, gettext }: | |||
| { stdenv, fetchurl, pkgconfig, glib, gettext, fetchFromGitHub, cmake, | |||
There was a problem hiding this comment.
fetchFromGitHub should replace fetchurl since you are not using the latter anymore
|
|
||
| stdenv.mkDerivation rec { | ||
| name= "sdcv-0.4.2"; | ||
| name = "sdcv-${version}"; | ||
| version = "0.5.2"; | ||
|
|
||
| meta = { | ||
| homepage = http://sdcv.sourceforge.net/; |
There was a problem hiding this comment.
This page now redirects to https://dushistov.github.io/sdcv/ so we should set meta.homepage to this new home.
| preBuild = '' | ||
| sed -i 's/guint32 page_size/size_t page_size/' src/lib/lib.cpp | ||
| preInstall = '' | ||
| touch locale |
There was a problem hiding this comment.
Just curious: why is this necessary?
There was a problem hiding this comment.
Without this:
CMake Error at cmake_install.cmake:60 (file):
file INSTALL cannot find
"/tmp/nix-build-sdcv-0.5.2.drv-0/source/build/locale".
lukateras
reviewed
Nov 10, 2017
| #define _UTILS_HPP_ | ||
|
|
||
| #include <string> | ||
| +#include <cstdlib> |
There was a problem hiding this comment.
I don't see this patch at upstream: https://github.com/Dushistov/sdcv/blob/v0.5.2/src/utils.hpp
It's used on Darwin, and my concern is that dropping this particular patch will break Darwin build. I guess let's wait what Travis CI has to say on that.
orivej
approved these changes
Nov 11, 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
The build was no longer working on latest fork of nixos-unstable.
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)