aland/nixpkgs-odroid-hc4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead

Browse source 
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948
this can do it nicely.

Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov 2021-04-03 12:58:10 +02:00 • committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

40
pkgs/shells/scponly/default.nix Normal file
View file

@ -0,0 +1,40 @@
{ stdenv, lib, fetchFromGitHub, openssh, debugLevel ? 0 }:
stdenv.mkDerivation {
pname = "scponly";
version = "4.8";
src = fetchFromGitHub {
owner = "scponly";
repo = "scponly";
rev = "d8ca58257b9905186aa5706f35813d5f80ea07c1";
sha256 = "U0K7lOp18ytNjh3KVFmc6vL+/tG4ETnwLEPQEhM4lXE=";
};
patches = [ ./scponly-fix-make.patch ];
strictDeps = true;
# chroot doesn't seem to work, so not enabling
# rsync could also be optionally enabled
configureFlags = [
"--enable-winscp-compat"
"scponly_PROG_SFTP_SERVER=${lib.getBin openssh}/libexec/sftp-server"
"scponly_PROG_SCP=${lib.getBin openssh}/bin/scp"
];
postInstall = lib.optionalString (debugLevel > 0) ''
mkdir -p $out/etc/scponly && echo ${
toString debugLevel
} > $out/etc/scponly/debuglevel
'';
passthru.shellPath = "/bin/scponly";
meta = with lib; {
description = "A shell that only permits scp and sftp-server";
homepage = "https://github.com/scponly/scponly";
license = with licenses; [ bsd2 ];
maintainers = with maintainers; [ wmertens ];
};
}

21
pkgs/shells/scponly/scponly-fix-make.patch Normal file
View file

@ -0,0 +1,21 @@
--- a/Makefile.in
+++ b/Makefile.in
@@ -41,14 +41,14 @@
${INSTALL} -d ${DESTDIR}${bindir}
${INSTALL} -d ${DESTDIR}${mandir}/man8
${INSTALL} -d ${DESTDIR}${CONFDIR}
- ${INSTALL} -o 0 -g 0 scponly ${DESTDIR}${bindir}/scponly
- ${INSTALL} -o 0 -g 0 -m 0644 scponly.8 ${DESTDIR}${mandir}/man8/scponly.8
- ${INSTALL} -o 0 -g 0 -m 0644 debuglevel ${DESTDIR}${DEBUGFILE}
+ ${INSTALL} scponly ${DESTDIR}${bindir}/scponly
+ ${INSTALL} -m 0644 scponly.8 ${DESTDIR}${mandir}/man8/scponly.8
+ ${INSTALL} -m 0644 debuglevel ${DESTDIR}${DEBUGFILE}
if test "x${CHROOTED_NAME}" != "x"; then \
${INSTALL} -d ${DESTDIR}${sbindir}; \
rm -f ${DESTDIR}${sbindir}/${CHROOTED_NAME}; \
cp scponly ${CHROOTED_NAME}; \
- ${INSTALL} -o 0 -g 0 -m 4755 ${CHROOTED_NAME} ${DESTDIR}${sbindir}/${CHROOTED_NAME}; \
+ ${INSTALL} ${CHROOTED_NAME} ${DESTDIR}${sbindir}/${CHROOTED_NAME}; \
fi
debuglevel: