summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavol Rusnak <pavol@rusnak.io>2022-12-27 19:45:56 +0100
committerGitHub <noreply@github.com>2022-12-27 19:45:56 +0100
commitb981d811453ab84fb3ea593a9b33b960f1ab9147 (patch)
tree33cba8f4185a25caa4b6ed44a5ddad2738728f9e
parentMerge pull request #207945 from wegank/mongoose-darwin (diff)
parentqdrant: unbreak on x86_64-darwin (diff)
downloadnixpkgs-b981d811453ab84fb3ea593a9b33b960f1ab9147.tar.gz
Merge pull request #207993 from prusnak/unbreak-darwin
{got, qdrant}: unbreak on x86_64-darwin
-rw-r--r--pkgs/applications/version-management/got/default.nix2
-rw-r--r--pkgs/servers/search/qdrant/default.nix2
-rw-r--r--pkgs/top-level/all-packages.nix4
3 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/applications/version-management/got/default.nix b/pkgs/applications/version-management/got/default.nix
index 86813d7a6c37..00b49f2957ad 100644
--- a/pkgs/applications/version-management/got/default.nix
+++ b/pkgs/applications/version-management/got/default.nix
@@ -46,7 +46,5 @@ stdenv.mkDerivation rec {
license = licenses.isc;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ abbe afh ];
- # never built on x86_64-darwin since first introduction in nixpkgs
- broken = stdenv.isDarwin && stdenv.isx86_64;
};
}
diff --git a/pkgs/servers/search/qdrant/default.nix b/pkgs/servers/search/qdrant/default.nix
index 4629e6fd6dd5..abde1176ceda 100644
--- a/pkgs/servers/search/qdrant/default.nix
+++ b/pkgs/servers/search/qdrant/default.nix
@@ -37,7 +37,5 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/qdrant/qdrant";
license = licenses.asl20;
maintainers = with maintainers; [ dit7ya ];
- # never built on x86_64-darwin since first introduction in nixpkgs
- broken = stdenv.isDarwin && stdenv.isx86_64;
};
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4effc9ca5f02..357acf66407d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10994,7 +10994,7 @@ with pkgs;
qarte = libsForQt5.callPackage ../applications/video/qarte { };
- qdrant = callPackage ../servers/search/qdrant { };
+ qdrant = darwin.apple_sdk_11_0.callPackage ../servers/search/qdrant { };
qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { };
@@ -29201,7 +29201,7 @@ with pkgs;
goffice = callPackage ../development/libraries/goffice { };
- got = callPackage ../applications/version-management/got { };
+ got = darwin.apple_sdk_11_0.callPackage ../applications/version-management/got { };
gtkterm = callPackage ../tools/misc/gtkterm { };