diff options
| author | Robin Gloster <mail@glob.in> | 2017-08-29 00:00:42 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-08-29 00:01:11 +0200 |
| commit | fdc18bc74c39b482bb5b0e102e03f764dfbff81f (patch) | |
| tree | 040f118b6b16ca68306eb03d416e8abda5eeedf4 /pkgs/development/libraries/uri | |
| parent | 9b65bc9649616d06a1dc32075807fd73ff26525c (diff) | |
| download | nixpkgs-fdc18bc74c39b482bb5b0e102e03f764dfbff81f.tar nixpkgs-fdc18bc74c39b482bb5b0e102e03f764dfbff81f.tar.gz nixpkgs-fdc18bc74c39b482bb5b0e102e03f764dfbff81f.tar.bz2 nixpkgs-fdc18bc74c39b482bb5b0e102e03f764dfbff81f.tar.lz nixpkgs-fdc18bc74c39b482bb5b0e102e03f764dfbff81f.tar.xz nixpkgs-fdc18bc74c39b482bb5b0e102e03f764dfbff81f.tar.zst nixpkgs-fdc18bc74c39b482bb5b0e102e03f764dfbff81f.zip | |
uri: 2016-09-04 -> 2017-07-16
Diffstat (limited to 'pkgs/development/libraries/uri')
| -rw-r--r-- | pkgs/development/libraries/uri/default.nix | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/pkgs/development/libraries/uri/default.nix b/pkgs/development/libraries/uri/default.nix index 61ac651256a..bec6f2d0f4b 100644 --- a/pkgs/development/libraries/uri/default.nix +++ b/pkgs/development/libraries/uri/default.nix @@ -1,30 +1,26 @@ { stdenv, fetchFromGitHub, cmake, doxygen }: stdenv.mkDerivation { - name = "uri-2016-09-04"; + name = "uri-2017-07-16"; src = fetchFromGitHub { owner = "cpp-netlib"; repo = "uri"; - rev = "8b1eec80621ea7be1db3b28f1621e531cc72855c"; - sha256 = "0f77y79b11pp31y0qpydki2nnxd6gpycp24fmrapi70fsni2ah0d"; + rev = "ac30f19cc7a4745667a8ebd3eac68d5e70b9a4a6"; + sha256 = "0ys295ij071rilwkk3xq1p3sdzgb0gyybvd3f0cahh67kh8hyk6n"; }; - buildInputs = [ cmake doxygen ]; + nativeBuildInputs = [ cmake doxygen ]; - cmakeFlags = [ "-DUri_BUILD_TESTS=OFF" "-DBUILD_SHARED_LIBS=ON" ]; + cmakeFlags = [ + "-DUri_BUILD_TESTS=OFF" "-DUri_BUILD_DOCS=ON" "-DBUILD_SHARED_LIBS=ON" + ]; - postBuild = '' - make doc - ''; + postBuild = "make doc"; - # https://github.com/cpp-netlib/uri/issues/90 postInstall = '' - mv $out/include $out/include2 - mv $out/include2/include $out/ - rmdir $out/include2 - mkdir -p $out/share/doc - mv html $out/share/doc/uri + install -vd $out/share/doc + cp -vR html $out/share/doc ''; meta = { |