mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 07:00:43 +00:00
Code Issues Wiki Activity

Merge remote-tracking branch 'upstream/master' into openssl-1.1

Browse source
This commit is contained in:
Robin Gloster 2019-08-21 14:52:07 +02:00
parent f4fc845e5b
commit bbf133d07e
No known key found for this signature in database
GPG key ID: D5C458DF6DD97EDF
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/applications/altcoins/bitcoin-unlimited.nix
View file

@ -1,12 +1,11 @@
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost
, zlib, miniupnpc, utillinux, protobuf, qrencode, libevent, python3 , zlib, miniupnpc, utillinux, protobuf, qrencode, libevent, python3
, withGui, wrapQtAppsHook, qtbase, qttools , withGui, wrapQtAppsHook ? null, qtbase ? null, qttools ? null
, Foundation, ApplicationServices, AppKit }: , Foundation, ApplicationServices, AppKit }:
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-unlimited-" + version; name = "bitcoin" + (toString (optional (!withGui) "d")) + "-unlimited-" + version;
version = "1.6.0.1"; version = "1.6.0.1";

2
pkgs/applications/altcoins/dogecoin.nix
View file

@ -2,7 +2,7 @@
, pkgconfig, autoreconfHook , pkgconfig, autoreconfHook
, db5, openssl, boost, zlib, miniupnpc, libevent , db5, openssl, boost, zlib, miniupnpc, libevent
, protobuf, utillinux, qt4, qrencode , protobuf, utillinux, qt4, qrencode
, withGui, libevent }: , withGui }:
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

2
pkgs/applications/misc/golden-cheetah/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub { stdenv, fetchFromGitHub, mkDerivation
, qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools , qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools
, qtconnectivity, qtcharts , qtconnectivity, qtcharts
, yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper , yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper