mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2025-01-01 16:34:15 +03:00
Merge branch 'master' of https://github.com/NixOS/nixpkgs
This commit is contained in:
Александр Цамутали
commit
6dba407b45
@ -8,7 +8,8 @@ let
|
||||
pkgconfig makeWrapper libglade pyopenssl libXScrnSaver
|
||||
libXt xproto libXext xextproto libX11 gtkspell aspell
|
||||
scrnsaverproto pycrypto pythonDBus pythonSexy
|
||||
docutils pyasn1
|
||||
docutils pyasn1 farstream gst_plugins_bad gstreamer
|
||||
gst_ffmpeg gst_python
|
||||
];
|
||||
in
|
||||
rec {
|
||||
@ -37,6 +38,7 @@ rec {
|
||||
sed -e 's^'"$i"'^'"$out/bin-wrapped/$name"'^' -i "$out/bin/$name"
|
||||
sed -e "2aexport LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}${a.gtkspell}/lib:${a.gtkspell}/lib64\"" -i "$out/bin/gajim"
|
||||
sed -e "2aexport NIX_LDFLAGS=\"\$NIX_LDFLAGS -L${a.gtkspell}/lib -L${a.gtkspell}/lib64\"" -i "$out/bin/gajim"
|
||||
sed -e "2aexport GST_PLUGIN_PATH=\"\$GST_PLUGIN_PATH''${GST_PLUGIN_PATH:+:}$(echo ${a.gst_plugins_bad}/lib/gstreamer-*):$(echo ${a.gst_ffmpeg}/lib/gstreamer-*):$(echo ${a.farstream}/lib/gstreamer-*)\"" -i "$out/bin/gajim"
|
||||
done
|
||||
'') ["wrapBinContentsPython"];
|
||||
|
||||
|
||||
@ -7,11 +7,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "julia";
|
||||
date = "20120904";
|
||||
date = "20120922";
|
||||
name = "${pname}-git-${date}";
|
||||
|
||||
grisu_ver = "1.1.1";
|
||||
dsfmt_ver = "2.1";
|
||||
dsfmt_ver = "2.2";
|
||||
openblas_ver = "v0.2.2";
|
||||
lapack_ver = "3.4.1";
|
||||
arpack_ver = "3.1.2";
|
||||
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||
dsfmt_src = fetchurl {
|
||||
url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmt_ver}.tar.gz";
|
||||
name = "dsfmt-${dsfmt_ver}.tar.gz";
|
||||
sha256 = "e9d3e04bc984ec3b14033342f5ebdcd5202d8d8e40128dd737f566945612378f";
|
||||
sha256 = "bc3947a9b2253a869fcbab8ff395416cb12958be9dba10793db2cd7e37b26899";
|
||||
};
|
||||
openblas_src = fetchurl {
|
||||
url = "https://github.com/xianyi/OpenBLAS/tarball/${openblas_ver}";
|
||||
@ -54,8 +54,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://github.com/JuliaLang/julia.git";
|
||||
rev = "b842bf4ae4d80f28803ec54f3da412a0248046a9";
|
||||
sha256 = "4d67f4f4d35c76ea8981198e42feb1c30a50ac7e1e15b752fa41b26ebadcd828";
|
||||
rev = "e1ba1ebf09da42a5bd7f4ed18f1595ae06032b4c";
|
||||
sha256 = "187e67a7c6bf44469e0e0dda41072ac8f3a40380ea9364ed07a4cadc08965663";
|
||||
};
|
||||
|
||||
buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
{ stdenv, fetchurl, libnice, pkgconfig, python, gstreamer, gst_plugins_base
|
||||
, pygobject, gst_python, gupnp_igd }:
|
||||
, pygobject, gst_python, gupnp_igd
|
||||
, gst_plugins_good, gst_plugins_bad, gst_ffmpeg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "farstream-0.1.2";
|
||||
@ -8,11 +10,13 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1nbkbvq959f70zhr03fwdibhs0sbf1k7zmbz9w99vda7gdcl0nps";
|
||||
};
|
||||
|
||||
buildInputs = [ libnice python pygobject gst_python gupnp_igd ];
|
||||
buildInputs = [ libnice python pygobject gupnp_igd ];
|
||||
|
||||
buildNativeInputs = [ pkgconfig ];
|
||||
|
||||
propagatedBuildInputs = [ gstreamer gst_plugins_base ];
|
||||
propagatedBuildInputs = [ gstreamer gst_plugins_base gst_python
|
||||
gst_plugins_good gst_plugins_bad gst_ffmpeg
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = http://www.freedesktop.org/wiki/Software/Farstream;
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ stdenv, fetchurl, perl }:
|
||||
{ stdenv, fetchurl, perl
|
||||
, withCryptodev ? false, cryptodevHeaders }:
|
||||
|
||||
let
|
||||
name = "openssl-1.0.0i";
|
||||
@ -45,6 +46,8 @@ stdenv.mkDerivation {
|
||||
|
||||
patches = patchesCross false;
|
||||
|
||||
buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders;
|
||||
|
||||
buildNativeInputs = [ perl ];
|
||||
|
||||
# On x86_64-darwin, "./config" misdetects the system as
|
||||
@ -52,7 +55,8 @@ stdenv.mkDerivation {
|
||||
configureScript =
|
||||
if stdenv.system == "x86_64-darwin" then "./Configure darwin64-x86_64-cc" else "./config";
|
||||
|
||||
configureFlags = "shared --libdir=lib";
|
||||
configureFlags = "shared --libdir=lib" +
|
||||
stdenv.lib.optionalString withCryptodev " -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS";
|
||||
|
||||
makeFlags = "MANDIR=$(out)/share/man";
|
||||
|
||||
|
||||
29
pkgs/os-specific/linux/cryptodev/default.nix
Normal file
29
pkgs/os-specific/linux/cryptodev/default.nix
Normal file
@ -0,0 +1,29 @@
|
||||
{ fetchurl, stdenv, kernel, onlyHeaders ? false }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cryptodev-linux-1.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.gna.org/cryptodev-linux/${name}.tar.gz";
|
||||
sha256 = "13hybl5p0ck0vgi2gxmiwa2810gcfk78kdy17ai8nczj8il15mn0";
|
||||
};
|
||||
|
||||
buildPhase = if (!onlyHeaders) then ''
|
||||
make -C ${kernel}/lib/modules/${kernel.modDirVersion}/build \
|
||||
SUBDIRS=`pwd` INSTALL_PATH=$out
|
||||
'' else ":";
|
||||
|
||||
installPhase = stdenv.lib.optionalString (!onlyHeaders) ''
|
||||
make -C ${kernel}/lib/modules/${kernel.modDirVersion}/build \
|
||||
INSTALL_MOD_PATH=$out SUBDIRS=`pwd` modules_install
|
||||
'' + ''
|
||||
mkdir -p $out/include/crypto
|
||||
cp crypto/cryptodev.h $out/include/crypto
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Device that allows access to Linux kernel cryptographic drivers";
|
||||
homepage = http://home.gna.org/cryptodev-linux/;
|
||||
license = "GPLv2+";
|
||||
};
|
||||
}
|
||||
@ -140,6 +140,10 @@ installPhase() {
|
||||
(cd arch/$archDir/include && cp -a asm/* $includeDir/asm/ || true)
|
||||
(cd arch/$archDir/include && cp -a generated/asm/* $includeDir/asm/ || true)
|
||||
(cd arch/$archDir/include/asm/mach-generic && cp -a * $includeDir/ || true)
|
||||
# include files for special arm architectures
|
||||
if [ "$archDir" == "arm" ]; then
|
||||
cp -a --parents arch/arm/mach-*/include $out/lib/modules/$version/build
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
@ -4605,6 +4605,10 @@ let
|
||||
|
||||
openssl = callPackage ../development/libraries/openssl {
|
||||
fetchurl = fetchurlBoot;
|
||||
cryptodevHeaders = linuxPackages.cryptodev.override {
|
||||
fetchurl = fetchurlBoot;
|
||||
onlyHeaders = true;
|
||||
};
|
||||
};
|
||||
|
||||
ortp = callPackage ../development/libraries/ortp { };
|
||||
@ -5869,6 +5873,8 @@ let
|
||||
|
||||
blcr = callPackage ../os-specific/linux/blcr { };
|
||||
|
||||
cryptodev = callPackage ../os-specific/linux/cryptodev { };
|
||||
|
||||
e1000e = callPackage ../os-specific/linux/e1000e {};
|
||||
|
||||
exmap = callPackage ../os-specific/linux/exmap { };
|
||||
@ -8683,7 +8689,7 @@ let
|
||||
gajim = builderDefsPackage (import ../applications/networking/instant-messengers/gajim) {
|
||||
inherit perl intltool pyGtkGlade gettext pkgconfig makeWrapper pygobject
|
||||
pyopenssl gtkspell libsexy pycrypto aspell pythonDBus pythonSexy
|
||||
docutils gtk;
|
||||
docutils gtk farstream gst_plugins_bad gstreamer gst_ffmpeg gst_python;
|
||||
dbus = dbus.libs;
|
||||
inherit (gnome) libglade;
|
||||
inherit (xlibs) libXScrnSaver libXt xproto libXext xextproto libX11
|
||||
|
||||
Loading…
Reference in New Issue
Block a user