diff options
| author | Brian Napolitano <25256195+bnapolitano@users.noreply.github.com> | 2024-04-27 16:08:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-27 16:08:40 -0500 |
| commit | 7f5518dd35171f2bead284d63e2fa923f3c415be (patch) | |
| tree | 2e297a643eb14cddae92135c6f90fd1408d1739e /pkgs/by-name/di | |
| parent | 89e27b75cd6e48f7cffcba7b65cb7e87f6fb6031 (diff) | |
| parent | 3ed7049cddddc675ea43a2c8b1c925e69230aa43 (diff) | |
Merge branch 'NixOS:master' into master
Diffstat (limited to 'pkgs/by-name/di')
| -rw-r--r-- | pkgs/by-name/di/digikam/package.nix | 8 | ||||
| -rw-r--r-- | pkgs/by-name/di/dissent/package.nix | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/by-name/di/digikam/package.nix b/pkgs/by-name/di/digikam/package.nix index 2efd6738969ab..14cd5731dc5be 100644 --- a/pkgs/by-name/di/digikam/package.nix +++ b/pkgs/by-name/di/digikam/package.nix @@ -26,6 +26,7 @@ , x265 , jasper +, bash # For panorama and focus stacking , enblend-enfuse , hugin @@ -110,6 +111,13 @@ stdenv.mkDerivation rec { cuda_cudart ]); + postPatch = '' + substituteInPlace \ + core/dplugins/bqm/custom/userscript/userscript.cpp \ + core/utilities/import/backend/cameracontroller.cpp \ + --replace-fail \"/bin/bash\" \"${lib.getExe bash}\" + ''; + cmakeFlags = [ "-DENABLE_MYSQLSUPPORT=1" "-DENABLE_INTERNALMYSQL=1" diff --git a/pkgs/by-name/di/dissent/package.nix b/pkgs/by-name/di/dissent/package.nix index b1580283a5d60..fdcc4ad37ce41 100644 --- a/pkgs/by-name/di/dissent/package.nix +++ b/pkgs/by-name/di/dissent/package.nix @@ -18,13 +18,13 @@ buildGoModule rec { pname = "dissent"; - version = "0.0.23"; + version = "0.0.24"; src = fetchFromGitHub { owner = "diamondburned"; repo = "dissent"; rev = "v${version}"; - hash = "sha256-aHY2XmrJv2SSoXIKj63xu6t+Yzaur/6OJUFKga7DWDg="; + hash = "sha256-XoppHkKQhWZbqVIViGIV0e0W/NhZW0v6ufmXlVtmzvI="; }; nativeBuildInputs = [ @@ -56,7 +56,7 @@ buildGoModule rec { install -D -m 444 internal/icons/hicolor/scalable/apps/so.libdb.dissent.svg $out/share/icons/hicolor/scalable/apps/so.libdb.dissent.svg ''; - vendorHash = "sha256-mwY1M81EWfbF/gYXQl5bcEXxN9N1npD+GgUSMc7gy90="; + vendorHash = "sha256-8/k9auM7+rceV26f3pNjEK1trzzAM530CX008pLZ1OA="; meta = with lib; { description = "GTK4 Discord client in Go, attempt #4 (formerly gtkcord4)"; |