diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-04-28 05:29:39 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-04-28 05:33:41 +0200 |
| commit | e89e2edc7349c0df15fa03b8229c370340547538 (patch) | |
| tree | 69805e409dd120efa67e2bf0fbd19d698835ac9a /pkgs/applications/misc/golden-cheetah | |
| parent | 4f422e4efb539a88f978603d375a80f08b5270dc (diff) | |
| download | nixpkgs-e89e2edc7349c0df15fa03b8229c370340547538.tar nixpkgs-e89e2edc7349c0df15fa03b8229c370340547538.tar.gz nixpkgs-e89e2edc7349c0df15fa03b8229c370340547538.tar.bz2 nixpkgs-e89e2edc7349c0df15fa03b8229c370340547538.tar.lz nixpkgs-e89e2edc7349c0df15fa03b8229c370340547538.tar.xz nixpkgs-e89e2edc7349c0df15fa03b8229c370340547538.tar.zst nixpkgs-e89e2edc7349c0df15fa03b8229c370340547538.zip | |
libusb-compat-0_1: rename from libusb
Diffstat (limited to 'pkgs/applications/misc/golden-cheetah')
| -rw-r--r-- | pkgs/applications/misc/golden-cheetah/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 3dffc5c77c2..761d05e5f9f 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, mkDerivation , qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools -, qtconnectivity, qtcharts, libusb +, qtconnectivity, qtcharts, libusb-compat-0_1 , yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper }: @@ -27,7 +27,7 @@ in mkDerivation rec { buildInputs = [ qtbase qtsvg qtserialport qtwebengine qtmultimedia qttools zlib - qtconnectivity qtcharts libusb + qtconnectivity qtcharts libusb-compat-0_1 ]; nativeBuildInputs = [ flex makeWrapper qmake yacc ]; @@ -39,9 +39,9 @@ in mkDerivation rec { cp src/gcconfig.pri.in src/gcconfig.pri cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri echo 'QMAKE_LRELEASE = ${qttools.dev}/bin/lrelease' >> src/gcconfig.pri - echo 'LIBUSB_INSTALL = ${libusb}' >> src/gcconfig.pri - echo 'LIBUSB_INCLUDE = ${libusb.dev}/include' >> src/gcconfig.pri - echo 'LIBUSB_LIBS = -L${libusb}/lib -lusb' >> src/gcconfig.pri + echo 'LIBUSB_INSTALL = ${libusb-compat-0_1}' >> src/gcconfig.pri + echo 'LIBUSB_INCLUDE = ${libusb-compat-0_1.dev}/include' >> src/gcconfig.pri + echo 'LIBUSB_LIBS = -L${libusb-compat-0_1}/lib -lusb' >> src/gcconfig.pri sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local # Use qtwebengine instead of qtwebkit |