diff options
| author | Orivej Desh <orivej@gmx.fr> | 2021-04-08 05:48:32 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2021-04-08 05:51:56 +0000 |
| commit | 90691042af87420a51bd0f9c2f85c2ad9f018443 (patch) | |
| tree | 2f5a19b6c1b79c21aef7b401c52a11be43dcb716 /pkgs/os-specific/linux/libcap | |
| parent | a634ea874acffbd49b315bded6a531d9d76d13f8 (diff) | |
| download | nixpkgs-90691042af87420a51bd0f9c2f85c2ad9f018443.tar nixpkgs-90691042af87420a51bd0f9c2f85c2ad9f018443.tar.gz nixpkgs-90691042af87420a51bd0f9c2f85c2ad9f018443.tar.bz2 nixpkgs-90691042af87420a51bd0f9c2f85c2ad9f018443.tar.lz nixpkgs-90691042af87420a51bd0f9c2f85c2ad9f018443.tar.xz nixpkgs-90691042af87420a51bd0f9c2f85c2ad9f018443.tar.zst nixpkgs-90691042af87420a51bd0f9c2f85c2ad9f018443.zip | |
libcap: fix static build
It supports static build with SHARED=no; the patch no longer applies. Tested by building pkgsStatic.libcap.
Diffstat (limited to 'pkgs/os-specific/linux/libcap')
| -rw-r--r-- | pkgs/os-specific/linux/libcap/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/libcap/no-shared-lib.patch | 22 |
2 files changed, 1 insertions, 25 deletions
diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index 54fab6a7746..871e04648e4 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-TelZDuCah8KC1Vhzf/tbYXXMv9JtWArdEN9E0PBH9sI="; }; - patches = lib.optional isStatic ./no-shared-lib.patch; - outputs = [ "out" "dev" "lib" "man" "doc" ] ++ lib.optional usePam "pam"; @@ -31,7 +29,7 @@ stdenv.mkDerivation rec { "PAM_CAP=${if usePam then "yes" else "no"}" "BUILD_CC=$(CC_FOR_BUILD)" "CC:=$(CC)" - ]; + ] ++ lib.optional isStatic "SHARED=no"; prePatch = '' # use full path to bash diff --git a/pkgs/os-specific/linux/libcap/no-shared-lib.patch b/pkgs/os-specific/linux/libcap/no-shared-lib.patch deleted file mode 100644 index 73dc7de063d..00000000000 --- a/pkgs/os-specific/linux/libcap/no-shared-lib.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/libcap/Makefile b/libcap/Makefile -index de6a28d..7e4d8ac 100644 ---- a/libcap/Makefile -+++ b/libcap/Makefile -@@ -22,7 +22,7 @@ MAJLIBNAME=$(LIBNAME).$(VERSION) - MINLIBNAME=$(MAJLIBNAME).$(MINOR) - GPERF_OUTPUT = _caps_output.gperf - --all: $(MINLIBNAME) $(STACAPLIBNAME) pcs $(STAPSXLIBNAME) -+all: $(STACAPLIBNAME) pcs $(STAPSXLIBNAME) - - pcs: libcap.pc libpsx.pc - -@@ -93,7 +93,7 @@ cap_test: cap_test.c libcap.h - test: cap_test - ./cap_test - --install: install-static install-shared -+install: install-static - - install-static: install-static-cap install-static-psx - |