summary refs log tree commit diff
path: root/pkgs/os-specific/bsd
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-04-23 14:48:35 +0000
committerAlyssa Ross <hi@alyssa.is>2021-04-23 14:48:35 +0000
commitbe7a9bab0fad716d56611791d6959e29c494772f (patch)
treeceff64b2551310c8a009bd10196c3537e95e69f3 /pkgs/os-specific/bsd
parentbb8d9a49ff9c092d24734ab50cff9d88b736d848 (diff)
downloadnixpkgs-be7a9bab0fad716d56611791d6959e29c494772f.tar
nixpkgs-be7a9bab0fad716d56611791d6959e29c494772f.tar.gz
nixpkgs-be7a9bab0fad716d56611791d6959e29c494772f.tar.bz2
nixpkgs-be7a9bab0fad716d56611791d6959e29c494772f.tar.lz
nixpkgs-be7a9bab0fad716d56611791d6959e29c494772f.tar.xz
nixpkgs-be7a9bab0fad716d56611791d6959e29c494772f.tar.zst
nixpkgs-be7a9bab0fad716d56611791d6959e29c494772f.zip
netbsd.librt: fix build
This is another one of those packages that's just a rebuild of a
certain part of libc...

Tested by building pkgsCross.x86_64-netbsd.netbsd.librt on
x86_64-linux.

libc's postPatch was entirely fixes for librt, so move that to librt
and inherit it in libc.
Diffstat (limited to 'pkgs/os-specific/bsd')
-rw-r--r--pkgs/os-specific/bsd/netbsd/default.nix10
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index 5492ba9087e..90080b152b0 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -665,6 +665,11 @@ in lib.makeScopeWithSplicing
     version = "8.0";
     sha256 = "078qsi4mg1hyyxr1awvjs9b0c2gicg3zw4vl603g1m9vm8gfxw9l";
     meta.platforms = lib.platforms.netbsd;
+    extraPaths = with self; [ common.src libc.src ];
+    postPatch = ''
+      sed -i 's,/usr\(/include/sys/syscall.h\),${self.headers}\1,g' \
+        $BSDSRCDIR/lib/{libc,librt}/sys/Makefile.inc
+    '';
   };
 
   libcrypt = mkDerivation {
@@ -807,10 +812,7 @@ in lib.makeScopeWithSplicing
       make -C $BSDSRCDIR/lib/libcrypt $makeFlags
       make -C $BSDSRCDIR/lib/libcrypt $makeFlags install
     '';
-    postPatch = ''
-      sed -i 's,/usr\(/include/sys/syscall.h\),${self.headers}\1,g' \
-        sys/Makefile.inc ../librt/sys/Makefile.inc
-    '';
+    inherit (self.librt) postPatch;
   };
   #
   # END LIBRARIES