From 899629ba4897bf84872ee8fa737eee37f1e22278 Mon Sep 17 00:00:00 2001 From: Jared Tobin Date: Sat, 14 Mar 2020 17:41:34 +0900 Subject: [PATCH] secp256k1-haskell: unbreak via override This library simply needs libsecp256k1 in its pkgconfig-depends. --- .../development/haskell-modules/configuration-hackage2nix.yaml | 1 - pkgs/development/haskell-modules/configuration-nix.nix | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 3c6845705336..e0350c7a2e40 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -9072,7 +9072,6 @@ broken-packages: - seclib - second-transfer - secp256k1 - - secp256k1-haskell - secp256k1-legacy - secret-santa - secret-sharing diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 5824ce2f5e6d..ff1c01aa8e87 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -498,6 +498,9 @@ self: super: builtins.intersectAttrs super { # requires autotools to build secp256k1 = addBuildTools super.secp256k1 [ pkgs.buildPackages.autoconf pkgs.buildPackages.automake pkgs.buildPackages.libtool ]; + # requires libsecp256k1 in pkgconfig-depends + secp256k1-haskell = addPkgconfigDepend super.secp256k1-haskell pkgs.secp256k1; + # tests require git and zsh hapistrano = addBuildTools super.hapistrano [ pkgs.buildPackages.git pkgs.buildPackages.zsh ];