Skip to content

Commit

Permalink
update nix configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
Vasily Pashkov committed Jun 20, 2022
1 parent 20fcb5d commit d1ff077
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 14 deletions.
10 changes: 9 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,15 @@ else()
message(STATUS "Your operating system is not supported")
endif()

target_link_libraries(runos-bin runos ${RUNOS_CLI} ${RUNOS_REST})
# target_link_libraries(runos-bin runos ${RUNOS_CLI} ${RUNOS_REST})
execute_process(
COMMAND bash -c "find /nix -name 'libstdc++.so.6' | grep gcc-11.3.0-lib"
OUTPUT_VARIABLE PATH_LIBSTDC
)

string(STRIP ${PATH_LIBSTDC} PATH_LIBSTDC_SO)
target_link_libraries(runos-bin runos ${RUNOS_CLI} ${RUNOS_REST} ${PATH_LIBSTDC_SO})


set_target_properties(runos-bin PROPERTIES OUTPUT_NAME runos)
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
2 changes: 1 addition & 1 deletion default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ in rec {
libtins
range-v3
tiny-process
pkgs.qt514.full
pkgs.libsForQt514.qtbase
pkgs.jq
]
# Qt build is broken on OS X. Use system Qt instead.
Expand Down
7 changes: 7 additions & 0 deletions nixpkgs/conan.nix
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,13 @@ let newPython = python3.override {
sha256 = "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b";
};
});
distro = super.distro.overridePythonAttrs (oldAttrs: rec {
version = "1.5.0";
src = oldAttrs.src.override {
inherit version;
sha256 = "14nz51cqlnxmgfqqilxyvjwwa5xfivdvlm0d0b1qzgcgwdm7an0f";
};
});
};
};

Expand Down
18 changes: 9 additions & 9 deletions nixpkgs/fmtlib.nix
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{ stdenv, fetchurl, cmake, unzip }:
{ stdenv, fetchFromGitHub, cmake, unzip }:

stdenv.mkDerivation rec {
version = "3.0.1";
version = "6.1.2";
name = "fmt-${version}";
src = fetchurl {
url = "https://github.com/fmtlib/fmt/releases/download/${version}/${name}.zip";
sha256 = "0l4514mk83cjimynci3ghrfdchjy8cya1qa45c1fg2lsj7fg16jc";
src = fetchFromGitHub {
owner = "fmtlib";
repo = "fmt";
rev = "398343897f98b88ade80bbebdcbe82a36c65a980";
sha256 = "0fzqfvwq98ir1mgmggm82xl673s1nbywn8mna50qjiqm71wqq09a";
};

preFixup = ''
rm $out/include/fmt/{format,ostream}.cc
'';

nativeBuildInputs = [ cmake unzip ];

nativeBuildInputs = [ cmake ];
enableParallelBuilding = true;
}
6 changes: 3 additions & 3 deletions nixpkgs/glog.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ stdenv.mkDerivation rec {
name = "glog";

src = fetchFromGitHub {
owner = "ARCCN";
owner = "google";
repo = "glog";
rev = "033e2ccfee54ba3f8400e76929e511f2f698f4db";
sha256 = "0q6dp96byggnkp1hnz52jqn88rpxhbpyy82k4i6mxvjgjgikhba9";
rev = "96a2f23dca4cc7180821ca5f32e526314395d26a";
sha256 = "1xd3maiipfbxmhc9rrblc5x52nxvkwxp14npg31y5njqvkvzax9b";
};

nativeBuildInputs = [ autoconf automake libtool ];
Expand Down

0 comments on commit d1ff077

Please sign in to comment.