diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-03-21 14:56:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-21 14:56:31 +0100 |
| commit | 444f009adf2dd35e29a5fe144ad9df87f2b4d04e (patch) | |
| tree | 1aab67341516e17cc3bc7c37f80060b270936ed4 /pkgs/os-specific/linux/tiscamera/default.nix | |
| parent | 67b7cbee5ee0ce1546e4c1275621446e210de4d2 (diff) | |
| parent | 86556ecb3515ce2f2e053dd47d4c7293b3111641 (diff) | |
| download | nixlib-444f009adf2dd35e29a5fe144ad9df87f2b4d04e.tar nixlib-444f009adf2dd35e29a5fe144ad9df87f2b4d04e.tar.gz nixlib-444f009adf2dd35e29a5fe144ad9df87f2b4d04e.tar.bz2 nixlib-444f009adf2dd35e29a5fe144ad9df87f2b4d04e.tar.lz nixlib-444f009adf2dd35e29a5fe144ad9df87f2b4d04e.tar.xz nixlib-444f009adf2dd35e29a5fe144ad9df87f2b4d04e.tar.zst nixlib-444f009adf2dd35e29a5fe144ad9df87f2b4d04e.zip | |
Merge pull request #297171 from wegank/tiscamera-bump
tiscamera: 1.0.0 -> 1.1.1
Diffstat (limited to 'pkgs/os-specific/linux/tiscamera/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/tiscamera/default.nix | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/pkgs/os-specific/linux/tiscamera/default.nix b/pkgs/os-specific/linux/tiscamera/default.nix index ce59cea368b1..600655c447f7 100644 --- a/pkgs/os-specific/linux/tiscamera/default.nix +++ b/pkgs/os-specific/linux/tiscamera/default.nix @@ -19,7 +19,8 @@ , gobject-introspection , gst_all_1 , wrapGAppsHook -, withDoc ? true + # needs pkg_resources +, withDoc ? false , sphinx , graphviz , withAravis ? true @@ -32,21 +33,15 @@ stdenv.mkDerivation rec { pname = "tiscamera"; - version = "1.0.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "TheImagingSource"; - repo = pname; - rev = "v-${pname}-${version}"; - sha256 = "0msz33wvqrji11kszdswcvljqnjflmjpk0aqzmsv6i855y8xn6cd"; + repo = "tiscamera"; + rev = "v-tiscamera-${version}"; + hash = "sha256-33U/8CbqNWIRwfDHXCZSN466WEQj9fip+Z5EJ7kIwRM="; }; - patches = [ - ./0001-tcamconvert-tcamsrc-add-missing-include-lib-dirs.patch - ./0001-udev-rules-fix-install-location.patch - ./0001-cmake-find-aravis-fix-pkg-cfg-include-dirs.patch - ]; - postPatch = '' cp ${catch2}/include/catch2/catch.hpp external/catch/catch.hpp @@ -110,6 +105,8 @@ stdenv.mkDerivation rec { "-DTCAM_INSTALL_FORCE_PREFIX=ON" ]; + env.CXXFLAGS = "-include cstdint"; + doCheck = true; # gstreamer tests requires, besides gst-plugins-bad, plugins installed by this expression. |