Unverified Commit 0e6d6f4a authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

various: migrate to pkgs/by-name (#456661)

parents c32d9740 59a5ee81
Loading
Loading
Loading
Loading
+4 −6
Original line number Diff line number Diff line
@@ -3,12 +3,10 @@
  lib,
  fetchFromGitHub,
  pkg-config,
  qmake,
  wrapQtAppsHook,
  opencv,
  spdlog,
  onnxruntime,
  qtx11extras,
  libsForQt5,
}:
stdenv.mkDerivation {
  pname = "aitrack";
@@ -23,14 +21,14 @@ stdenv.mkDerivation {

  nativeBuildInputs = [
    pkg-config
    qmake
    wrapQtAppsHook
    libsForQt5.qmake
    libsForQt5.wrapQtAppsHook
  ];

  buildInputs = [
    opencv
    spdlog
    qtx11extras
    libsForQt5.qtx11extras
    onnxruntime
  ];

+3 −4
Original line number Diff line number Diff line
@@ -8,12 +8,11 @@
  procps,
  python3,
  libdwarf,
  qtbase,
  wrapQtAppsHook,
  libglvnd,
  gtest,
  brotli,
  enableGui ? true,
  libsForQt5,
}:

stdenv.mkDerivation rec {
@@ -38,7 +37,7 @@ stdenv.mkDerivation rec {
    brotli
  ]
  ++ lib.optionals enableGui [
    qtbase
    libsForQt5.qtbase
  ];

  nativeBuildInputs = [
@@ -47,7 +46,7 @@ stdenv.mkDerivation rec {
    python3
  ]
  ++ lib.optionals enableGui [
    wrapQtAppsHook
    libsForQt5.wrapQtAppsHook
  ];

  cmakeFlags = [
+3 −4
Original line number Diff line number Diff line
@@ -2,11 +2,10 @@
  lib,
  stdenv,
  libGLU,
  qtbase,
  fetchurl,
  dpkg,
  autoPatchelfHook,
  wrapQtAppsHook,
  libsForQt5,
}:

stdenv.mkDerivation (finalAttrs: {
@@ -21,11 +20,11 @@ stdenv.mkDerivation (finalAttrs: {
  nativeBuildInputs = [
    dpkg
    autoPatchelfHook
    wrapQtAppsHook
    libsForQt5.wrapQtAppsHook
  ];

  buildInputs = [
    qtbase
    libsForQt5.qtbase
    libGLU
  ];

+3 −4
Original line number Diff line number Diff line
@@ -3,12 +3,11 @@
  stdenv,
  fetchFromGitHub,
  pkg-config,
  qmake,
  python3,
  qtbase,
  rocksdb_7_10,
  zeromq,
  nix-update-script,
  libsForQt5,
}:

stdenv.mkDerivation (finalAttrs: {
@@ -24,12 +23,12 @@ stdenv.mkDerivation (finalAttrs: {

  nativeBuildInputs = [
    pkg-config
    qmake
    libsForQt5.qmake
  ];

  buildInputs = [
    python3
    qtbase
    libsForQt5.qtbase
    rocksdb_7_10
    zeromq
  ];
Loading