public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

google-gflags: move to aliases.nix

Browse Source 
google-gflags were renamed to gflags in 2012:
https://github.com/gflags/gflags/#25-january-2012

gflags.name will be updated in staging.
This commit is contained in:
Orivej Desh
2019-07-25 09:18:32 +00:00
parent 2f55e705e2
commit b5d1d50aa9
14 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/science/misc/openmvs/default.nix
+4 -4
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake
, eigen, opencv, ceres-solver, cgal, boost, vcg
, gmp, mpfr, glog, google-gflags, libjpeg_turbo }:
, gmp, mpfr, glog, gflags, libjpeg_turbo }:
stdenv.mkDerivation rec {
name = "openmvs-unstable-2018-05-26";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "12dgkwwfdp24581y3i41gsd1k9hq0aw917q0ja5s0if4qbmc8pni";
};
buildInputs = [ eigen opencv ceres-solver cgal boost vcg gmp mpfr glog google-gflags libjpeg_turbo ];
buildInputs = [ eigen opencv ceres-solver cgal boost vcg gmp mpfr glog gflags libjpeg_turbo ];
nativeBuildInputs = [ cmake pkgconfig ];
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
"-DCERES_DIR=${ceres-solver}/lib/cmake/Ceres/"
)
'';
postFixup = ''
rp=$(patchelf --print-rpath $out/bin/DensifyPointCloud)
patchelf --set-rpath $rp:$out/lib/OpenMVS $out/bin/DensifyPointCloud
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
rp=$(patchelf --print-rpath $out/bin/TextureMesh)
patchelf --set-rpath $rp:$out/lib/OpenMVS $out/bin/TextureMesh
'';
cmakeDir = "./";
dontUseCmakeBuildDir = true;