diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-11-10 15:18:19 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-11-10 15:18:19 +0100 |
commit | afabc4a15d5ba6631bd4d865b8be37fc67d52809 (patch) | |
tree | 2342d9e8bd8b4cfbfee2b9a98c088df9f1c809ca /pkgs/applications/graphics/photoqt/default.nix | |
parent | 9a0c85ffc5aedc46b4d81f3b9fc22d7f488e3ff9 (diff) | |
parent | 714e527a726c9613fca8e13586a1b19198d68d9b (diff) | |
download | nixlib-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar nixlib-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar.gz nixlib-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar.bz2 nixlib-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar.lz nixlib-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar.xz nixlib-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar.zst nixlib-afabc4a15d5ba6631bd4d865b8be37fc67d52809.zip |
Merge remote-tracking branch 'origin/master' into HEAD
Conflicts: pkgs/development/libraries/SDL2/default.nix
Diffstat (limited to 'pkgs/applications/graphics/photoqt/default.nix')
-rw-r--r-- | pkgs/applications/graphics/photoqt/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 6a7a57fd25f2..9513b92f60ac 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -30,8 +30,13 @@ stdenv.mkDerivation rec { hash = "sha256-kVf9+zI9rtEMmS0N4qrN673T/1fnqfcV3hQPnMXMLas="; }; + postPatch = '' + # exiv2 0.28.1 + substituteInPlace CMakeLists.txt \ + --replace "exiv2lib" "exiv2" + '' # error: no member named 'setlocale' in namespace 'std'; did you mean simply 'setlocale'? - postPatch = lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.isDarwin '' substituteInPlace cplusplus/main.cpp \ --replace "std::setlocale" "setlocale" ''; |