summary refs log tree commit diff
path: root/pkgs/development/libraries/libieee1284
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-11-09 20:59:02 +0000
committerAlyssa Ross <hi@alyssa.is>2021-11-10 11:27:30 +0000
commit1b36833f2c1bf1f9972c1f745966ed3a3f66f40d (patch)
tree4121c2803edde115cc6b9af87e4058893d042991 /pkgs/development/libraries/libieee1284
parent1f40da32dfdc9466585d82b318b144fcf6933099 (diff)
downloadnixpkgs-1b36833f2c1bf1f9972c1f745966ed3a3f66f40d.tar
nixpkgs-1b36833f2c1bf1f9972c1f745966ed3a3f66f40d.tar.gz
nixpkgs-1b36833f2c1bf1f9972c1f745966ed3a3f66f40d.tar.bz2
nixpkgs-1b36833f2c1bf1f9972c1f745966ed3a3f66f40d.tar.lz
nixpkgs-1b36833f2c1bf1f9972c1f745966ed3a3f66f40d.tar.xz
nixpkgs-1b36833f2c1bf1f9972c1f745966ed3a3f66f40d.tar.zst
nixpkgs-1b36833f2c1bf1f9972c1f745966ed3a3f66f40d.zip
pkgsMusl.libieee1284: fix build
When building for Linux, it assumes that Glibc-specific functionality
is available even though it has a fallback for when it isn't.  This
patch teaches it to only use Glibc-specific functionality on Glibc.
Diffstat (limited to 'pkgs/development/libraries/libieee1284')
-rw-r--r--pkgs/development/libraries/libieee1284/default.nix14
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libieee1284/default.nix b/pkgs/development/libraries/libieee1284/default.nix
index 7c20d1b4947..a2cbd6e4096 100644
--- a/pkgs/development/libraries/libieee1284/default.nix
+++ b/pkgs/development/libraries/libieee1284/default.nix
@@ -1,4 +1,6 @@
-{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, xmlto, docbook_xml_dtd_412, docbook_xsl }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch
+, autoconf, automake, libtool, xmlto, docbook_xml_dtd_412, docbook_xsl
+}:
 
 stdenv.mkDerivation rec {
   pname = "libieee1284";
@@ -11,6 +13,14 @@ stdenv.mkDerivation rec {
     sha256 = "0wfv1prmhhpyll9l4g1ij3im7hk9mm96ydw3l9fvhjp3993cdn2x";
   };
 
+  patches = [
+    # Fix build on Musl.
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/void-linux/void-packages/861ac185a6b60134292ff93d40e40b5391d0aa8e/srcpkgs/libieee1284/patches/musl.patch";
+      sha256 = "03xivd6z7m51i5brlmzs60pjrlqyr4561qlnh182wa7rrm01x5y6";
+    })
+  ];
+
   nativeBuildInputs = [
     autoconf
     automake
@@ -24,7 +34,7 @@ stdenv.mkDerivation rec {
     "--without-python"
   ];
 
-  preConfigure = ''
+  prePatch = ''
     ./bootstrap
   '';