diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-12-01 19:00:09 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-12-01 19:00:09 +0100 |
| commit | 9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d (patch) | |
| tree | 4368f9e4cb2d5b93a956c085337e45cb70f1e331 /nixpkgs/pkgs/development/libraries/spdk | |
| parent | a9cbfb6941b47d6f50129e6e36927882392daed7 (diff) | |
| parent | 2344fe1da14cb08b0c18743b207995f9b8597915 (diff) | |
| download | nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.gz nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.bz2 nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.lz nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.xz nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.zst nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.zip | |
Merge https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/spdk')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/spdk/0001-fix-setuptools-installation.patch | 29 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/spdk/default.nix | 7 |
2 files changed, 35 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/development/libraries/spdk/0001-fix-setuptools-installation.patch b/nixpkgs/pkgs/development/libraries/spdk/0001-fix-setuptools-installation.patch new file mode 100644 index 000000000000..3c3fb50fc152 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/spdk/0001-fix-setuptools-installation.patch @@ -0,0 +1,29 @@ +From 3f718fc1873c9c138684ea019e9bd42c9b24506c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> +Date: Tue, 28 Nov 2023 11:28:11 +0100 +Subject: [PATCH] fix setuptools installation +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jörg Thalheim <joerg@thalheim.io> +--- + python/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/python/Makefile b/python/Makefile +index f835daa..b41995a 100644 +--- a/python/Makefile ++++ b/python/Makefile +@@ -12,7 +12,7 @@ setup_cmd += --root $(DESTDIR) + endif + + ifneq ($(CONFIG_PYDIR),) +-setup_cmd += --install-purelib $(CONFIG_PYDIR) ++setup_cmd += --root / --prefix $(CONFIG_PYDIR) + purelibdir := $(CONFIG_PYDIR) + else + purelibdir := $(shell python3 -c "import sysconfig; print(sysconfig.get_paths()['purelib'])") +-- +2.42.0 + diff --git a/nixpkgs/pkgs/development/libraries/spdk/default.nix b/nixpkgs/pkgs/development/libraries/spdk/default.nix index c7b83db53489..c62f54b14091 100644 --- a/nixpkgs/pkgs/development/libraries/spdk/default.nix +++ b/nixpkgs/pkgs/development/libraries/spdk/default.nix @@ -57,6 +57,7 @@ stdenv.mkDerivation rec { patches = [ # https://review.spdk.io/gerrit/c/spdk/spdk/+/20394 ./setuptools.patch + ./0001-fix-setuptools-installation.patch ]; postPatch = '' @@ -67,9 +68,13 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-dpdk=${dpdk}" - "--pydir=${placeholder "out"}/${python3.sitePackages}" + "--pydir=${placeholder "out"}" ]; + postCheck = '' + python3 -m spdk + ''; + env.NIX_CFLAGS_COMPILE = "-mssse3"; # Necessary to compile. # otherwise does not find strncpy when compiling env.NIX_LDFLAGS = "-lbsd"; |