Merge master into staging-next
This commit is contained in:
commit
b50b9be6e4
|
@ -3,7 +3,6 @@
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, SDL2
|
, SDL2
|
||||||
, cmake
|
, cmake
|
||||||
, copyDesktopItems
|
|
||||||
, cubeb
|
, cubeb
|
||||||
, curl
|
, curl
|
||||||
, extra-cmake-modules
|
, extra-cmake-modules
|
||||||
|
@ -48,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
copyDesktopItems
|
|
||||||
extra-cmake-modules
|
extra-cmake-modules
|
||||||
ninja
|
ninja
|
||||||
pkg-config
|
pkg-config
|
||||||
|
|
|
@ -548,6 +548,7 @@ let
|
||||||
clustermq = [ pkgs.pkg-config ];
|
clustermq = [ pkgs.pkg-config ];
|
||||||
coga = [ pkgs.gsl.dev ];
|
coga = [ pkgs.gsl.dev ];
|
||||||
deepSNV = with pkgs; [ xz.dev bzip2.dev zlib.dev ];
|
deepSNV = with pkgs; [ xz.dev bzip2.dev zlib.dev ];
|
||||||
|
epialleleR = with pkgs; [ xz.dev bzip2.dev zlib.dev ];
|
||||||
gpg = [ pkgs.gpgme ];
|
gpg = [ pkgs.gpgme ];
|
||||||
webp = [ pkgs.libwebp ];
|
webp = [ pkgs.libwebp ];
|
||||||
RMark = [ pkgs.which ];
|
RMark = [ pkgs.which ];
|
||||||
|
@ -999,6 +1000,7 @@ let
|
||||||
"muscData"
|
"muscData"
|
||||||
"org_Mxanthus_db"
|
"org_Mxanthus_db"
|
||||||
"scpdata"
|
"scpdata"
|
||||||
|
"signatureSearch"
|
||||||
"nullrangesData"
|
"nullrangesData"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
, lib
|
, lib
|
||||||
, fetchFromBitbucket
|
, fetchFromBitbucket
|
||||||
, cmake
|
, cmake
|
||||||
, copyDesktopItems
|
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, zlib
|
, zlib
|
||||||
|
@ -25,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "V2pSP8i20zB50WtUMujzij+ISSupdQQ/oCYYrOaTU1g=";
|
sha256 = "V2pSP8i20zB50WtUMujzij+ISSupdQQ/oCYYrOaTU1g=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake copyDesktopItems pkg-config ]
|
nativeBuildInputs = [ cmake pkg-config ]
|
||||||
++ lib.optionals stdenv.isDarwin [ makeWrapper ];
|
++ lib.optionals stdenv.isDarwin [ makeWrapper ];
|
||||||
buildInputs = [ zlib bzip2 libjpeg SDL2 SDL2_net SDL2_mixer gtk3 ];
|
buildInputs = [ zlib bzip2 libjpeg SDL2 SDL2_net SDL2_mixer gtk3 ];
|
||||||
|
|
||||||
|
|
|
@ -189,7 +189,7 @@ let
|
||||||
|
|
||||||
Alternatively you can configure a predicate to allow specific packages:
|
Alternatively you can configure a predicate to allow specific packages:
|
||||||
{ nixpkgs.config.${predicateConfigAttr} = pkg: builtins.elem (lib.getName pkg) [
|
{ nixpkgs.config.${predicateConfigAttr} = pkg: builtins.elem (lib.getName pkg) [
|
||||||
"${getName attrs}"
|
"${lib.getName attrs}"
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -4,7 +4,6 @@
|
||||||
, boost
|
, boost
|
||||||
, cgal
|
, cgal
|
||||||
, cmake
|
, cmake
|
||||||
, copyDesktopItems
|
|
||||||
, gpp
|
, gpp
|
||||||
, mpfr
|
, mpfr
|
||||||
, qtbase
|
, qtbase
|
||||||
|
@ -36,7 +35,6 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
copyDesktopItems
|
|
||||||
wrapQtAppsHook
|
wrapQtAppsHook
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user