diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-11-02 12:01:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-02 12:01:31 +0000 |
| commit | 4b05cc6f66f5cd9e4c340467cf1c1d99954e76ca (patch) | |
| tree | 0d00013f8e08cc71fbd9c8dfb1f10591761f7718 /pkgs/tools | |
| parent | 70ca403dc22e97fb4b73ab74af29e1c8a1f45f69 (diff) | |
| parent | c020d94ff9b568ab494e6f0438b724b8a5948a26 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/graphics/gmic/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/tools/virtualization/cloud-init/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/virtualization/extra-container/default.nix | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index 00a736fac822f..8f66d054cde68 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -75,6 +75,9 @@ stdenv.mkDerivation rec { # CMake build files were moved to subdirectory. mv resources/CMakeLists.txt resources/cmake . + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace CMakeLists.txt \ + --replace "LD_LIBRARY_PATH" "DYLD_LIBRARY_PATH" ''; passthru = { diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index ed12f81013625..6a2d0fcdda70d 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -118,7 +118,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://cloudinit.readthedocs.org"; description = "Provides configuration and customization of cloud instance"; license = with licenses; [ asl20 gpl3Plus ]; - maintainers = with maintainers; [ madjar phile314 illustris ]; + maintainers = with maintainers; [ phile314 illustris ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/virtualization/extra-container/default.nix b/pkgs/tools/virtualization/extra-container/default.nix index eee1baca28ae0..e57c430597742 100644 --- a/pkgs/tools/virtualization/extra-container/default.nix +++ b/pkgs/tools/virtualization/extra-container/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "extra-container"; - version = "0.10"; + version = "0.11"; src = fetchFromGitHub { owner = "erikarvstedt"; |