From f639d6bb0906046d9758e7b4a3eabb7c99958d64 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 10 Jan 2015 23:38:16 +0100 Subject: [PATCH] darcs: switch to haskell-ng build --- pkgs/top-level/all-packages.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bafa89a87a2..b5f6de26369 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2516,7 +2516,7 @@ let }; ssss = callPackage ../tools/security/ssss { }; - + stress = callPackage ../tools/system/stress { }; storeBackup = callPackage ../tools/backup/store-backup { }; @@ -9460,15 +9460,11 @@ let d4x = callPackage ../applications/misc/d4x { }; - darcs = with haskellPackages_ghc784; callPackage ../applications/version-management/darcs { - cabal = cabal.override { - extension = self : super : { - enableSharedExecutables = false; - isLibrary = false; - configureFlags = "-f-library " + super.configureFlags or ""; - }; - }; - }; + darcs = haskell-ng.lib.overrideCabal haskellngPackages.darcs (drv: { + configureFlags = (stdenv.lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"]; + enableSharedExecutables = false; + isLibrary = false; + }); darktable = callPackage ../applications/graphics/darktable { inherit (gnome) GConf libglade;