From f145201b35d731435c9fe1afc79e91bcccffa774 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Feb 2015 12:10:56 +0100 Subject: [PATCH] git-annex: disable shared linking for this executable git-annex has literally dozens of dependencies, and loading all of them at run-time can be slow (https://github.com/NixOS/nixpkgs/issues/4239). --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- pkgs/development/haskell-modules/lib.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6e64bde1bb43..f8df6ae7ca5d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -37,7 +37,7 @@ self: super: { zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; }; # These changes are required to support Darwin. - git-annex = super.git-annex.override { + git-annex = (disableSharedExecutables super.git-annex).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null; hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify; diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 8337411e1adc..323030f1eaff 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -40,8 +40,8 @@ rec { enableLibraryProfiling = drv: overrideCabal drv (drv: { enableLibraryProfiling = true; }); disableLibraryProfiling = drv: overrideCabal drv (drv: { enableLibraryProfiling = false; }); - enableSharedExecutables = drv: overrideCabal drv ( { enableSharedExecutables = true; }); - disableSharedExecutables = drv: overrideCabal drv ( { enableSharedExecutables = false; }); + enableSharedExecutables = drv: overrideCabal drv (drv: { enableSharedExecutables = true; }); + disableSharedExecutables = drv: overrideCabal drv (drv: { enableSharedExecutables = false; }); enableSharedLibraries = drv: overrideCabal drv (drv: { enableSharedLibraries = true; }); disableSharedLibraries = drv: overrideCabal drv (drv: { enableSharedLibraries = false; });