public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

at: cross-compilation fixes

Browse Source 
* move bison/flex to nativeBuildInputs
* add patch to avoid use of undocumented glibc macro
* fix use of 'install -s' to avoid invoking 'strip' directly
This commit is contained in:
Will Dietz 2018-01-04 13:25:13 -06:00 committed by John Ericson
parent dc8bd43249
commit a23be78ef2
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/tools/system/at/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, bison, flex, pam { stdenv, fetchurl, fetchpatch, bison, flex, pam
, sendmailPath ? "/run/wrappers/bin/sendmail" , sendmailPath ? "/run/wrappers/bin/sendmail"
, atWrapperPath ? "/run/wrappers/bin/at" , atWrapperPath ? "/run/wrappers/bin/at"
}: }:
@ -13,10 +13,17 @@ stdenv.mkDerivation rec {
sha256 = "1fgsrqpx0r6qcjxmlsqnwilydhfxn976c870mjc0n1bkmcy94w88"; sha256 = "1fgsrqpx0r6qcjxmlsqnwilydhfxn976c870mjc0n1bkmcy94w88";
}; };
patches = [ ./install.patch ]; patches = [
./install.patch
(fetchpatch {
url = "https://raw.githubusercontent.com/riscv/riscv-poky/master/meta/recipes-extended/at/at/0001-remove-glibc-assumption.patch";
sha256 = "1rk4hskp0c1jqkanzdxf873i6jgki3xhrm609fsam8an8sl1njnm";
})
];
buildInputs = nativeBuildInputs = [ bison flex ];
[ bison flex pam ];
buildInputs = [ pam ];
preConfigure = preConfigure =
'' ''

4
pkgs/tools/system/at/install.patch
View File

@ -20,7 +20,7 @@
+ $(INSTALL) -m 755 -d $(IROOT)$(sbindir) + $(INSTALL) -m 755 -d $(IROOT)$(sbindir)
+ $(INSTALL) -m 755 -d $(IROOT)$(docdir) + $(INSTALL) -m 755 -d $(IROOT)$(docdir)
+ $(INSTALL) -m 755 -d $(IROOT)$(atdocdir) + $(INSTALL) -m 755 -d $(IROOT)$(atdocdir)
+ $(INSTALL) -m 0755 -s at $(IROOT)$(bindir) + $(INSTALL) -m 0755 at $(IROOT)$(bindir)
$(LN_S) -f at $(IROOT)$(bindir)/atq $(LN_S) -f at $(IROOT)$(bindir)/atq
$(LN_S) -f at $(IROOT)$(bindir)/atrm $(LN_S) -f at $(IROOT)$(bindir)/atrm
- $(INSTALL) -g root -o root -m 755 batch $(IROOT)$(bindir) - $(INSTALL) -g root -o root -m 755 batch $(IROOT)$(bindir)
@ -34,7 +34,7 @@
+ $(INSTALL) -d -m 755 $(IROOT)$(man1dir) + $(INSTALL) -d -m 755 $(IROOT)$(man1dir)
+ $(INSTALL) -d -m 755 $(IROOT)$(man5dir) + $(INSTALL) -d -m 755 $(IROOT)$(man5dir)
+ $(INSTALL) -d -m 755 $(IROOT)$(man8dir) + $(INSTALL) -d -m 755 $(IROOT)$(man8dir)
+ $(INSTALL) -m 755 -s atd $(IROOT)$(sbindir) + $(INSTALL) -m 755 atd $(IROOT)$(sbindir)
+ $(INSTALL) -m 755 atrun $(IROOT)$(sbindir) + $(INSTALL) -m 755 atrun $(IROOT)$(sbindir)
+ $(INSTALL) -m 644 at.1 $(IROOT)$(man1dir)/ + $(INSTALL) -m 644 at.1 $(IROOT)$(man1dir)/
cd $(IROOT)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1 cd $(IROOT)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1