diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-03-24 11:04:41 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-03-24 11:04:41 +0100 |
| commit | 5423cabbbf2b6dec5568f1ecabd288d5d9a642ec (patch) | |
| tree | f316a6a921bfefd3a63bd4502c2eb50ff1644f67 /nixpkgs/pkgs/tools/graphics/quirc/0001-dont-build-demos.patch | |
| parent | 46a88117a05c3469af5d99433af140c3de8ca088 (diff) | |
| parent | 8aa81f34981add12aecada6c702ddbbd0375ca36 (diff) | |
| download | nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.gz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.bz2 nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.lz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.xz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.zst nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/tools/graphics/quirc/0001-dont-build-demos.patch')
| -rw-r--r-- | nixpkgs/pkgs/tools/graphics/quirc/0001-dont-build-demos.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/tools/graphics/quirc/0001-dont-build-demos.patch b/nixpkgs/pkgs/tools/graphics/quirc/0001-dont-build-demos.patch index 9ecb6dda4e19..5e11a5207508 100644 --- a/nixpkgs/pkgs/tools/graphics/quirc/0001-dont-build-demos.patch +++ b/nixpkgs/pkgs/tools/graphics/quirc/0001-dont-build-demos.patch @@ -4,8 +4,8 @@ index 2d5b745..ecef988 100644 +++ b/Makefile @@ -37,7 +37,7 @@ DEMO_UTIL_OBJ = \ - OPENCV_CFLAGS != pkg-config --cflags opencv4 - OPENCV_LIBS != pkg-config --libs opencv4 + OPENCV_CFLAGS := $(shell pkg-config --cflags opencv4 2>&1) + OPENCV_LIBS = $(shell pkg-config --libs opencv4) -QUIRC_CXXFLAGS = $(QUIRC_CFLAGS) $(OPENCV_CFLAGS) --std=c++17 +QUIRC_CXXFLAGS = $(QUIRC_CFLAGS) --std=c++17 |