abonerib/nix-serve-ng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix nix-serve-ng.cabal

Browse Source 
… to use `pkgconfig-depends` instead of `extra-libraries`.

The former works better with both `cabal` and `cabal2nix`
This commit is contained in:
Gabriella Gonzalez 2022-07-01 12:00:26 -07:00
parent 01167e8dcb
commit c8d0b47a7a
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nix-serve-ng.cabal
View File

@ -55,8 +55,8 @@ executable nix-serve-ng
, warp
, warp-tls
extra-libraries: nixstore
, nixutil
pkgconfig-depends:
nix-store
if os(darwin)
extra-libraries: c++

8
nix/nix-serve-ng.nix
View File

@ -1,6 +1,6 @@
{ mkDerivation, base, base16, base32, bytestring, charset
, http-types, lib, managed, megaparsec, mtl, network, nixstore
, nixutil, optparse-applicative, vector, wai, wai-extra, warp
, http-types, managed, megaparsec, mtl, network, nix
, optparse-applicative, stdenv, vector, wai, wai-extra, warp
, warp-tls
}:
mkDerivation {
@ -13,7 +13,7 @@ mkDerivation {
base base16 base32 bytestring charset http-types managed megaparsec
mtl network optparse-applicative vector wai wai-extra warp warp-tls
];
executableSystemDepends = [ nixstore nixutil ];
executablePkgconfigDepends = [ nix ];
description = "A drop-in replacement for nix-serve that's faster and more stable";
license = lib.licenses.asl20;
license = stdenv.lib.licenses.asl20;
}

5
shell.nix
View File

@ -12,10 +12,7 @@ let
(haskellPackagesNew: haskellPackagesOld: {
nix-serve-ng =
pkgsNew.haskell.lib.overrideCabal
(haskellPackagesNew.callPackage ./nix/nix-serve-ng.nix {
nixstore = pkgsNew.nix;
nixutil = pkgsNew.nix;
})
(haskellPackagesNew.callPackage ./nix/nix-serve-ng.nix { })
(old: {
executableSystemDepends = (old.executableSystemDepends or []) ++ [
pkgsNew.boost.dev