Merge pull request #43 from dubhokku/master

updated CMakeLists with including libstdc
ARCCN · Nov 11, 2022 · 6860cc8 · 6860cc8
2 parents 7b111e6 + e867f03
commit 6860cc8
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 41 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -95,7 +95,7 @@ endif()
 
 # 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"
+    COMMAND bash -c "find /nix -name 'libstdc++.so.6' | grep gcc-11 | head -n 1"
     OUTPUT_VARIABLE PATH_LIBSTDC
 )
 

diff --git a/default.nix b/default.nix
@@ -28,7 +28,7 @@ in rec {
     nativeBuildInputs = [
       pkgs.gcc9
       pkgs.cmake
-      pkgs.pkgconfig
+      pkgs.pkg-config
       pkgs.nodePackages.uglify-js
     ];
 
@@ -45,7 +45,7 @@ in rec {
       pkgs.libedit # CLI
       cpp-netlib # REST
       conan
-      pkgs.google-gflags
+      pkgs.gflags
       glog # Logging
       libevent
       libfluid_base

diff --git a/nixpkgs/conan.nix b/nixpkgs/conan.nix
@@ -21,33 +21,6 @@ let newPython = python3.override {
         sha256 = "1dv6mjsm67l1razcgmq66riqmsb36wns17mnipqr610v0z0zf5j0";
       };
     });
-    # https://github.com/conan-io/conan/issues/8876
-    pyjwt = super.pyjwt.overridePythonAttrs (oldAttrs: rec {
-      version = "1.7.1";
-      src = oldAttrs.src.override {
-        inherit version;
-        sha256 = "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96";
-      };
-      disabledTests = [
-        "test_ec_verify_should_return_false_if_signature_invalid"
-      ];
-    });
-    # conan needs jinja2<3
-    jinja2 = super.jinja2.overridePythonAttrs (oldAttrs: rec {
-      version = "2.11.3";
-      src = oldAttrs.src.override {
-        inherit version;
-        sha256 = "a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6";
-      };
-    });
-    # old jinja2 needs old markupsafe
-    markupsafe = super.markupsafe.overridePythonAttrs (oldAttrs: rec {
-      version = "1.1.1";
-      src = oldAttrs.src.override {
-        inherit version;
-        sha256 = "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b";
-      };
-    });
     distro = super.distro.overridePythonAttrs (oldAttrs: rec {
       version = "1.5.0";
       src = oldAttrs.src.override {
@@ -59,14 +32,14 @@ let newPython = python3.override {
 };
 
 in newPython.pkgs.buildPythonApplication rec {
-  version = "1.43.1";
+  version = "1.49.0";
   pname = "conan";
 
   src = fetchFromGitHub {
     owner = "conan-io";
     repo = "conan";
     rev = version;
-    sha256 = "0jwi7smgy2d9m49igijqr2p4ncw5nksjbijj8fzjvf1lgxgnyjhr";
+    hash = "sha256-BJGstNAnAZtpwagsCY+4quTd0/79zL+v4ifKikS3vaw=";
   };
 
   propagatedBuildInputs = with newPython.pkgs; [
@@ -116,4 +89,4 @@ in newPython.pkgs.buildPythonApplication rec {
     license = licenses.mit;
     maintainers = with maintainers; [ HaoZeke ];
   };
-}
+}
diff --git a/nixpkgs/glog.nix b/nixpkgs/glog.nix
@@ -1,4 +1,4 @@
-{ stdenv, autoconf, automake, libtool, fetchFromGitHub, google-gflags }:
+{ stdenv, autoconf, automake, libtool, fetchFromGitHub, gflags }:
 
 stdenv.mkDerivation rec {
   name = "glog";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ autoconf automake libtool ];
-  buildInputs = [ google-gflags ];
+  buildInputs = [ gflags ];
 
   preConfigure = ''
     ./autogen.sh

diff --git a/nixpkgs/libfluid_base.nix b/nixpkgs/libfluid_base.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, openssl, libevent }:
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, openssl, libevent }:
 
 stdenv.mkDerivation rec {
   name = "libfluid_base";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "0zhzh417vcxqyf6mhyg8ra01ax24gk39a8ddhr94ar6llfy2wrly";
   };
 
-  nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
+  nativeBuildInputs = [ autoconf automake libtool pkg-config ];
   buildInputs = [ openssl ];
   propagatedBuildInputs = [ libevent ];
   CXXFLAGS = ["-std=c++11"];

diff --git a/nixpkgs/libfluid_msg.nix b/nixpkgs/libfluid_msg.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig }:
+{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkg-config }:
 
 stdenv.mkDerivation rec {
   name = "libfluid_msg";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "0k3gxrkj9fxbwpbrf8a65m9akjxqfc1ah40f9g51fclln06d3wcy";
   };
 
-  nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
+  nativeBuildInputs = [ autoconf automake libtool pkg-config ];
   buildInputs = [ ];
 
   preConfigure = ''

diff --git a/nixpkgs/mettle.nix b/nixpkgs/mettle.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pythonPackages,
-  pkgconfig, ninja, which, patchelf,
+  pkg-config, ninja, which, patchelf,
   boost165
 }:
 
@@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
     doCheck = false;
   };
 
-  nativeBuildInputs = [ pkgconfig bfg9000 ];
+  nativeBuildInputs = [ pkg-config bfg9000 ];
   buildInputs = [ boost165 ];
 
   patchPhase = ''