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

Merge branch 'fixups' of git://github.com/thoughtpolice/nixpkgs 

Fixups for several of my packages

[ Shea: Includes fixes for criu and duo-unix ]
This commit is contained in:
Shea Levy 2014-03-20 19:56:57 -04:00
parent 491a99e7bf 529fdedf05
commit 3352bd83d6
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/os-specific/linux/criu/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl, protobuf, protobufc, asciidoc, xmlto, utillinux }: { stdenv, fetchurl, protobuf, protobufc, asciidoc, xmlto, utillinux }:
assert stdenv.system == "x86_64-linux";
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "criu-${version}"; name = "criu-${version}";
version = "1.2"; version = "1.2";
@ -24,14 +25,14 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
mkdir -p $out/etc/logrotate.d mkdir -p $out/etc/logrotate.d
make install PREFIX=$out LIBDIR=$out/lib make install PREFIX=$out LIBDIR=$out/lib ASCIIDOC=${asciidoc}/bin/asciidoc XMLTO=${xmlto}/bin/xmlto
''; '';
meta = { meta = {
description = "userspace checkpoint/restore for Linux"; description = "userspace checkpoint/restore for Linux";
homepage = "http://criu.org"; homepage = "http://criu.org";
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux; platforms = [ "x86_64-linux" ];
maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
}; };
} }

2
pkgs/tools/security/duo-unix/default.nix
View File

@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
[ "--with-pam=$(out)/lib/security" [ "--with-pam=$(out)/lib/security"
"--prefix=$(out)" "--prefix=$(out)"
"--sysconfdir=$(out)/etc/duo" "--sysconfdir=$(out)/etc/duo"
"--with-openssl=${openssl}"
"--enable-lib64=no"
]; ];
meta = { meta = {

7
pkgs/tools/security/scrypt/default.nix
View File

@ -13,8 +13,9 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "The scrypt encryption utility"; description = "The scrypt encryption utility";
homepage = https://www.tarsnap.com/scrypt.html; homepage = https://www.tarsnap.com/scrypt.html;
license = "BSD"; license = stdenv.lib.licenses.bsd2;
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
}; };
} }