Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5b96398b4d65
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4c4b1023399c
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Jun 18, 2017

  1. freicoin: fix build by disabling miniupnpc support 

    development has stalled and miniupnpc library is incompatible with
freicoin.
    @Mic92
    Mic92 committed Jun 18, 2017
    Copy the full SHA
    f43da04 View commit details

  2. memorycoin: fix build by disabling miniupnpc support

    @Mic92
    Mic92 committed Jun 18, 2017
    Copy the full SHA
    8a8cc00 View commit details

  3. primecoin: fix build by disabling upnp support

    @Mic92
    Mic92 committed Jun 18, 2017
    Copy the full SHA
    4c4b102 View commit details
Showing with 14 additions and 8 deletions.
  1. +4 −2 pkgs/applications/altcoins/freicoin.nix
  2. +5 −3 pkgs/applications/altcoins/memorycoin.nix
  3. +5 −3 pkgs/applications/altcoins/primecoin.nix
6 changes: 4 additions & 2 deletions pkgs/applications/altcoins/freicoin.nix
View file
Original file line number Diff line number Diff line change
@@ -11,16 +11,18 @@ stdenv.mkDerivation rec {
sha256 = "1m5pcnfhwhcj7q00p2sy3h73rkdm3w6grmljgiq53gshcj08cq1z";
};

qmakeFlags = ["USE_UPNP=-"];

# I think that openssl and zlib are required, but come through other
# packages

installPhase = ''
mkdir -p $out/bin
cp freicoin-qt $out/bin
'';
'';

nativeBuildInputs = [ qmake4Hook ];
buildInputs = [ db boost gmp mpfr miniupnpc qt4 ];
buildInputs = [ db boost gmp mpfr qt4 ];

meta = with stdenv.lib; {
description = "Peer-to-peer currency with demurrage fee";
8 changes: 5 additions & 3 deletions pkgs/applications/altcoins/memorycoin.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, openssl, db48, boost
, zlib, miniupnpc, qt4, qmake4Hook, utillinux, protobuf, qrencode
, zlib, qt4, qmake4Hook, utillinux, protobuf, qrencode
, withGui }:

with stdenv.lib;
@@ -13,10 +13,12 @@ stdenv.mkDerivation rec{
sha256 = "1iyh6dqrg0mirwci5br5n5qw3ghp2cs23wd8ygr56bh9ml4dr1m8";
};

buildInputs = [ pkgconfig openssl db48 boost zlib
miniupnpc utillinux protobuf ]
buildInputs = [ pkgconfig openssl db48 boost zlib utillinux protobuf ]
++ optionals withGui [ qt4 qmake4Hook qrencode ];

qmakeFlags = ["USE_UPNP=-"];
makeFlags = ["USE_UPNP=-"];

configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
++ optionals withGui [ "--with-gui=qt4" ];

8 changes: 5 additions & 3 deletions pkgs/applications/altcoins/primecoin.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, openssl, db48, boost
, zlib, miniupnpc, qt4, qmake4Hook, utillinux, protobuf, qrencode
, zlib, qt4, qmake4Hook, utillinux, protobuf, qrencode
, withGui }:

with stdenv.lib;
@@ -13,8 +13,10 @@ stdenv.mkDerivation rec{
sha256 = "0cixnkici74204s9d5iqj5sccib5a8dig2p2fp1axdjifpg787i3";
};

buildInputs = [ pkgconfig openssl db48 boost zlib
miniupnpc utillinux protobuf ]
qmakeFlags = ["USE_UPNP=-"];
makeFlags = ["USE_UPNP=-"];

buildInputs = [ pkgconfig openssl db48 boost zlib utillinux protobuf ]
++ optionals withGui [ qt4 qmake4Hook qrencode ];

configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]