Unverified Commit 3b72abe0 authored by Sandro Jäckel's avatar Sandro Jäckel
Browse files

influxdb{,2}: fix replace warning

parent c3b557c7

pkgs/servers/nosql/influxdb/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ let 
        mkdir -p $out/include $out/pkgconfig

        cp -r $NIX_BUILD_TOP/source/libflux/include/influxdata $out/include

        substitute $pkgcfgPath $out/pkgconfig/flux.pc \

          --replace /out $out

          --replace-fail /out $out

      ''

      + lib.optionalString stdenv.hostPlatform.isDarwin ''

        install_name_tool -id $out/lib/libflux.dylib $out/lib/libflux.dylib

pkgs/servers/nosql/influxdb2/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ let 
        mkdir -p $out/include $out/pkgconfig

        cp -r $NIX_BUILD_TOP/source/libflux/include/influxdata $out/include

        substitute $pkgcfgPath $out/pkgconfig/flux.pc \

          --replace /out $out

          --replace-fail /out $out

      ''

      + lib.optionalString stdenv.hostPlatform.isDarwin ''

        install_name_tool -id $out/lib/libflux.dylib $out/lib/libflux.dylib
@@ -95,7 +95,7 @@ buildGoModule { 
  postPatch = ''

    # use go-bindata from environment

    substituteInPlace static/static.go \

      --replace 'go run github.com/kevinburke/go-bindata/' ""

      --replace-fail 'go run github.com/kevinburke/go-bindata/' ""

  '';



  # Check that libflux and the UI are at the right version, and embed