utillinux: rename to util-linux
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, openssl, db53, boost
|
||||
, zlib, miniupnpc, qtbase ? null , qttools ? null, utillinux, protobuf, qrencode, libevent
|
||||
, zlib, miniupnpc, qtbase ? null , qttools ? null, util-linux, protobuf, qrencode, libevent
|
||||
, withGui, python3, jemalloc, zeromq4 }:
|
||||
|
||||
with stdenv.lib;
|
||||
@@ -20,7 +20,7 @@ mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ pkgconfig cmake ];
|
||||
buildInputs = [ openssl db53 boost zlib python3 jemalloc zeromq4
|
||||
miniupnpc utillinux protobuf libevent ]
|
||||
miniupnpc util-linux protobuf libevent ]
|
||||
++ optionals withGui [ qtbase qttools qrencode ];
|
||||
|
||||
cmakeFlags = optionals (!withGui) [
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost
|
||||
, zlib, miniupnpc, qtbase ? null, qttools ? null, utillinux, protobuf, qrencode, libevent
|
||||
, zlib, miniupnpc, qtbase ? null, qttools ? null, util-linux, protobuf, qrencode, libevent
|
||||
, withGui }:
|
||||
|
||||
with stdenv.lib;
|
||||
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook ];
|
||||
buildInputs = [ openssl db48 boost zlib
|
||||
miniupnpc utillinux protobuf libevent ]
|
||||
miniupnpc util-linux protobuf libevent ]
|
||||
++ optionals withGui [ qtbase qttools qrencode ];
|
||||
|
||||
configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
, miniupnpc
|
||||
, libevent
|
||||
, protobuf
|
||||
, utillinux
|
||||
, util-linux
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook ];
|
||||
buildInputs = [ openssl db5 openssl utillinux
|
||||
buildInputs = [ openssl db5 openssl util-linux
|
||||
protobuf boost zlib miniupnpc libevent ];
|
||||
|
||||
configureFlags = [ "--with-incompatible-bdb"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost
|
||||
, zlib, miniupnpc, utillinux, protobuf, qrencode, libevent, python3
|
||||
, zlib, miniupnpc, util-linux, protobuf, qrencode, libevent, python3
|
||||
, withGui, wrapQtAppsHook ? null, qtbase ? null, qttools ? null
|
||||
, Foundation, ApplicationServices, AppKit }:
|
||||
|
||||
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook python3 ]
|
||||
++ optionals withGui [ wrapQtAppsHook qttools ];
|
||||
buildInputs = [ openssl db48 boost zlib
|
||||
miniupnpc utillinux protobuf libevent ]
|
||||
miniupnpc util-linux protobuf libevent ]
|
||||
++ optionals withGui [ qtbase qttools qrencode ]
|
||||
++ optionals stdenv.isDarwin [ Foundation ApplicationServices AppKit ];
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
, qtbase ? null
|
||||
, qttools ? null
|
||||
, wrapQtAppsHook ? null
|
||||
, utillinux
|
||||
, util-linux
|
||||
, python3
|
||||
, qrencode
|
||||
, libevent
|
||||
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
|
||||
++ optional stdenv.isDarwin hexdump
|
||||
++ optional withGui wrapQtAppsHook;
|
||||
buildInputs = [ db48 boost zlib zeromq miniupnpc libevent ]
|
||||
++ optionals stdenv.isLinux [ utillinux ]
|
||||
++ optionals stdenv.isLinux [ util-linux ]
|
||||
++ optionals withGui [ qtbase qttools qrencode ];
|
||||
|
||||
postInstall = optional withGui ''
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ fetchFromGitHub, stdenv, pkgconfig, autoreconfHook
|
||||
, openssl, db48, boost, zlib, miniupnpc
|
||||
, qrencode, glib, protobuf, yasm, libevent
|
||||
, utillinux
|
||||
, util-linux
|
||||
, enable_Upnp ? false
|
||||
, disable_Wallet ? false
|
||||
, disable_Daemon ? false }:
|
||||
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook ];
|
||||
buildInputs = [ glib openssl db48 yasm boost zlib libevent
|
||||
miniupnpc protobuf qrencode utillinux ];
|
||||
miniupnpc protobuf qrencode util-linux ];
|
||||
|
||||
|
||||
configureFlags = [ "--with-boost-libdir=${boost.out}/lib --with-gui=no" ]
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ stdenv , fetchFromGitHub
|
||||
, pkgconfig, autoreconfHook
|
||||
, db5, openssl, boost, zlib, miniupnpc, libevent
|
||||
, protobuf, utillinux, qt4, qrencode
|
||||
, protobuf, util-linux, qt4, qrencode
|
||||
, withGui }:
|
||||
|
||||
with stdenv.lib;
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook ];
|
||||
buildInputs = [ openssl db5 openssl utillinux
|
||||
buildInputs = [ openssl db5 openssl util-linux
|
||||
protobuf boost zlib miniupnpc libevent ]
|
||||
++ optionals withGui [ qt4 qrencode ];
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ stdenv, lib, fetchurl, unzip, glib, systemd, nss, nspr, gtk3-x11, pango,
|
||||
atk, cairo, gdk-pixbuf, xorg, xorg_sys_opengl, utillinux, alsaLib, dbus, at-spi2-atk,
|
||||
atk, cairo, gdk-pixbuf, xorg, xorg_sys_opengl, util-linux, alsaLib, dbus, at-spi2-atk,
|
||||
cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
|
||||
xorg.libXrender
|
||||
xorg.libXtst
|
||||
xorg_sys_opengl
|
||||
utillinux
|
||||
util-linux
|
||||
xorg.libXrandr
|
||||
xorg.libXScrnSaver
|
||||
alsaLib
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ stdenv, mkDerivation, fetchFromGitHub
|
||||
, pkgconfig, autoreconfHook
|
||||
, openssl, db48, boost, zlib, miniupnpc
|
||||
, glib, protobuf, utillinux, qrencode
|
||||
, glib, protobuf, util-linux, qrencode
|
||||
, AppKit
|
||||
, withGui ? true, libevent
|
||||
, qtbase, qttools
|
||||
@@ -24,7 +24,7 @@ mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook ];
|
||||
buildInputs = [ openssl db48 boost zlib zeromq
|
||||
miniupnpc glib protobuf utillinux libevent ]
|
||||
miniupnpc glib protobuf util-linux libevent ]
|
||||
++ optionals stdenv.isDarwin [ AppKit ]
|
||||
++ optionals withGui [ qtbase qttools qrencode ];
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ fetchFromGitHub, stdenv, pkgconfig, autoreconfHook, wrapQtAppsHook ? null
|
||||
, openssl, db48, boost, zlib, miniupnpc, gmp
|
||||
, qrencode, glib, protobuf, yasm, libevent
|
||||
, utillinux, qtbase ? null, qttools ? null
|
||||
, util-linux, qtbase ? null, qttools ? null
|
||||
, enableUpnp ? false
|
||||
, disableWallet ? false
|
||||
, disableDaemon ? false
|
||||
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook ] ++ optionals withGui [ wrapQtAppsHook ];
|
||||
buildInputs = [ glib gmp openssl db48 yasm boost zlib libevent miniupnpc protobuf utillinux ]
|
||||
buildInputs = [ glib gmp openssl db48 yasm boost zlib libevent miniupnpc protobuf util-linux ]
|
||||
++ optionals withGui [ qtbase qttools qrencode ];
|
||||
|
||||
configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ stdenv, libsodium, fetchFromGitHub, wget, pkgconfig, autoreconfHook, openssl, db62, boost17x
|
||||
, zlib, gtest, gmock, callPackage, gmp, qt4, utillinux, protobuf, qrencode, libevent }:
|
||||
, zlib, gtest, gmock, callPackage, gmp, qt4, util-linux, protobuf, qrencode, libevent }:
|
||||
|
||||
let librustzcash = callPackage ./librustzcash {};
|
||||
in
|
||||
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
buildInputs = [ gtest gmock gmp openssl wget db62 boost17x zlib
|
||||
protobuf libevent libsodium librustzcash ]
|
||||
++ optionals stdenv.isLinux [ utillinux ];
|
||||
++ optionals stdenv.isLinux [ util-linux ];
|
||||
|
||||
configureFlags = [ "--with-boost-libdir=${boost17x.out}/lib" ];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user