diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-02-13 02:28:07 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-04-10 23:51:05 +0000 |
| commit | a3251fb2e0ade5c4d83d41108cbabc6c79f2bd7e (patch) | |
| tree | d6ed1c4d4f8d14410722ddf7303612bb42af318e /pkgs | |
| parent | 8edca5ad7943d4ea4f61be5c22cacb1fa8d10acd (diff) | |
| download | nixpkgs-a3251fb2e0ade5c4d83d41108cbabc6c79f2bd7e.tar nixpkgs-a3251fb2e0ade5c4d83d41108cbabc6c79f2bd7e.tar.gz nixpkgs-a3251fb2e0ade5c4d83d41108cbabc6c79f2bd7e.tar.bz2 nixpkgs-a3251fb2e0ade5c4d83d41108cbabc6c79f2bd7e.tar.lz nixpkgs-a3251fb2e0ade5c4d83d41108cbabc6c79f2bd7e.tar.xz nixpkgs-a3251fb2e0ade5c4d83d41108cbabc6c79f2bd7e.tar.zst nixpkgs-a3251fb2e0ade5c4d83d41108cbabc6c79f2bd7e.zip | |
motif: fix format-security
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/motif/default.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/development/libraries/motif/default.nix b/pkgs/development/libraries/motif/default.nix index 28b954d948c..f99bd8f2630 100644 --- a/pkgs/development/libraries/motif/default.nix +++ b/pkgs/development/libraries/motif/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libtool +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libtool , xlibsWrapper, xbitmaps, libXrender, libXmu, libXt , expat, libjpeg, libpng, libiconv , flex @@ -26,14 +26,18 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libXp libXau ]; - hardeningDisable = [ "format" ]; - prePatch = lib.optionalString (!demoSupport) '' sed '/^SUBDIRS =,^$/s/\<demos\>//' -i Makefile.{am,in} ''; - patches = [ ./Remove-unsupported-weak-refs-on-darwin.patch - ./Add-X.Org-to-bindings-file.patch + patches = [ + ./Remove-unsupported-weak-refs-on-darwin.patch + ./Add-X.Org-to-bindings-file.patch + (fetchpatch rec { + name = "fix-format-security.patch"; + url = "https://raw.githubusercontent.com/void-linux/void-packages/b9a1110dabb01c052dadc1abae1413bd4afe3652/srcpkgs/motif/patches/02-${name}"; + sha256 = "13vzpf8yxvhf4gl7q0yzlr6ak1yzx382fsqsrv5lc8jbbg4nwrrq"; + }) ]; enableParallelBuilding = true; |