nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-06 12:14:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sysdig-0.1.82-now-with-osx' of git://github.com/proger/nixpkgs

Browse Source 
sysdig: updated to 0.1.82, starting to support Darwin builds (includes
luajit Darwin support)
This commit is contained in:
Shea Levy 2014-05-12 09:34:23 -04:00
commit 89238a251c
3 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/interpreters/luajit/default.nix
View File

@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
patchPhase = stdenv.lib.optionalString (stdenv.gcc.libc != null) patchPhase = ''
substituteInPlace Makefile \
--replace /usr/local $out
'' + stdenv.lib.optionalString (stdenv.gcc.libc != null)
'' ''
substituteInPlace Makefile \ substituteInPlace Makefile \
--replace ldconfig ${stdenv.gcc.libc}/sbin/ldconfig --replace ldconfig ${stdenv.gcc.libc}/sbin/ldconfig
@ -21,11 +24,11 @@ stdenv.mkDerivation rec {
buildFlags = [ "amalg" ]; # Build highly optimized version buildFlags = [ "amalg" ]; # Build highly optimized version
installPhase = "make install PREFIX=$out"; installPhase = "make install PREFIX=$out";
meta = { meta = with stdenv.lib; {
description = "high-performance JIT compiler for Lua 5.1"; description = "high-performance JIT compiler for Lua 5.1";
homepage = http://luajit.org; homepage = http://luajit.org;
license = stdenv.lib.licenses.mit; license = licenses.mit;
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux ++ platforms.darwin;
maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; maintainers = [ maintainers.thoughtpolice ];
}; };
} }

22
pkgs/os-specific/linux/sysdig/default.nix
View File

@ -1,15 +1,16 @@
{stdenv, fetchurl, cmake, luajit, kernel, zlib}: {stdenv, fetchurl, cmake, luajit, kernel, zlib}:
let let
inherit (stdenv.lib) optional optionalString;
s = rec { s = rec {
baseName="sysdig"; baseName="sysdig";
version="0.1.81"; version="0.1.82";
name="${baseName}-${version}"; name="${baseName}-${version}";
url="https://github.com/draios/sysdig/archive/${version}.tar.gz"; url="https://github.com/draios/sysdig/archive/${version}.tar.gz";
sha256="0p9j1fy7lr027nsvr5bq0416nlsbvk02irzazmigsbr03fg0x1wv"; sha256="0yjxsdjbkp5dihg5xhkyl3lg64dl40a0b5cvcai8gz74w2955mnk";
}; };
buildInputs = [ buildInputs = [
cmake luajit kernel zlib cmake zlib luajit
]; ] ++ optional (kernel != null) kernel;
in in
stdenv.mkDerivation { stdenv.mkDerivation {
inherit (s) name version; inherit (s) name version;
@ -24,17 +25,18 @@ stdenv.mkDerivation {
]; ];
preConfigure = '' preConfigure = ''
export INSTALL_MOD_PATH="$out" export INSTALL_MOD_PATH="$out"
'' + optionalString (kernel != null) ''
export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
''; '';
postInstall = '' postInstall = optionalString (kernel != null) ''
make install_driver make install_driver
''; '';
meta = { meta = with stdenv.lib; {
inherit (s) version; inherit (s) version;
description = ''A tracepoint-based system tracing tool for Linux''; description = ''A tracepoint-based system tracing tool for Linux (with clients for other OSes)'';
license = stdenv.lib.licenses.gpl2 ; license = licenses.gpl2;
maintainers = [stdenv.lib.maintainers.raskin]; maintainers = [maintainers.raskin];
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux ++ platforms.darwin;
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -7381,6 +7381,10 @@ let
statifier = builderDefsPackage (import ../os-specific/linux/statifier) { }; statifier = builderDefsPackage (import ../os-specific/linux/statifier) { };
sysdig = callPackage ../os-specific/linux/sysdig {
kernel = null;
}; # pkgs.sysdig is a client, for a driver look at linuxPackagesFor
sysfsutils = callPackage ../os-specific/linux/sysfsutils { }; sysfsutils = callPackage ../os-specific/linux/sysfsutils { };
sysprof = callPackage ../development/tools/profiling/sysprof { sysprof = callPackage ../development/tools/profiling/sysprof {