diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-04-28 14:39:00 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-06-10 08:52:36 +0000 |
| commit | 693e64ef7421374338ddb1dc12b9573feec75972 (patch) | |
| tree | 2526ac075d248699c35d63e04499890ee4381f5f /nixpkgs/pkgs/development/libraries/kissfft/0001-pkgconfig-darwin.patch | |
| parent | 7014df2256694d97093d6f2bb1db340d346dea88 (diff) | |
| parent | 8e4fe32876ca15e3d5eb3ecd3ca0b224417f5f17 (diff) | |
| download | nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.gz nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.bz2 nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.lz nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.xz nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.zst nixlib-693e64ef7421374338ddb1dc12b9573feec75972.zip | |
Merge commit '8e4fe32876ca15e3d5eb3ecd3ca0b224417f5f17'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/kissfft/0001-pkgconfig-darwin.patch')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/kissfft/0001-pkgconfig-darwin.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/kissfft/0001-pkgconfig-darwin.patch b/nixpkgs/pkgs/development/libraries/kissfft/0001-pkgconfig-darwin.patch new file mode 100644 index 000000000000..534d46f0c8ba --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/kissfft/0001-pkgconfig-darwin.patch @@ -0,0 +1,48 @@ +From c0dc376be9154d143574a818417ceed23308b5f2 Mon Sep 17 00:00:00 2001 +From: OPNA2608 <christoph.neidahl@gmail.com> +Date: Sun, 18 Apr 2021 01:45:20 +0200 +Subject: [PATCH] pkgconfig darwin + +--- + Makefile | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/Makefile b/Makefile +index 971c6d6..0f4be0c 100644 +--- a/Makefile ++++ b/Makefile +@@ -153,7 +153,6 @@ endif + # -DKISS_FFT_BUILD to TYPEFLAGS + # + +-ifneq ($(shell uname -s),Darwin) + PKGCONFIG_KISSFFT_VERSION = $(KFVER_MAJOR).$(KFVER_MINOR).$(KFVER_PATCH) + PKGCONFIG_KISSFFT_OUTPUT_NAME = $(KISSFFTLIB_SHORTNAME) + PKGCONFIG_PKG_KISSFFT_DEFS = $(TYPEFLAGS) +@@ -170,7 +169,6 @@ ifneq ($(shell uname -s),Darwin) + PKGCONFIG_KISSFFT_LIBDIR = $(ABS_LIBDIR) + endif + PKGCONFIG_KISSFFT_PKGINCLUDEDIR = $${includedir}/kissfft +-endif + + export TYPEFLAGS + +@@ -226,7 +224,6 @@ ifneq ($(KISSFFT_STATIC), 1) + ln -sf $(KISSFFTLIB_NAME) $(KISSFFTLIB_SODEVELNAME) + endif + endif +-ifneq ($(shell uname -s),Darwin) + mkdir "$(ABS_LIBDIR)/pkgconfig" + sed \ + -e 's+@PKGCONFIG_KISSFFT_VERSION@+$(PKGCONFIG_KISSFFT_VERSION)+' \ +@@ -238,7 +235,6 @@ ifneq ($(shell uname -s),Darwin) + -e 's+@PKGCONFIG_KISSFFT_LIBDIR@+$(PKGCONFIG_KISSFFT_LIBDIR)+' \ + -e 's+@PKGCONFIG_KISSFFT_PKGINCLUDEDIR@+$(PKGCONFIG_KISSFFT_PKGINCLUDEDIR)+' \ + kissfft.pc.in 1>"$(ABS_LIBDIR)/pkgconfig/$(KISSFFT_PKGCONFIG)" +-endif + ifneq ($(KISSFFT_TOOLS), 0) + make -C tools install + endif +-- +2.29.3 + |