From 5a55ec20e36557ad523556437b2378780762dc80 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 8 Sep 2016 00:03:50 +0200 Subject: [PATCH] ledger: fix libdir --- pkgs/applications/office/ledger/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index ac90e0c4cb2b..07726ba90a41 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation { enableParallelBuilding = true; + cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; + # Skip byte-compiling of emacs-lisp files because this is currently # broken in ledger... postInstall = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29121b7c3154..14161743097a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13880,9 +13880,7 @@ in linuxband = callPackage ../applications/audio/linuxband { }; ledger2 = callPackage ../applications/office/ledger/2.6.3.nix { }; - ledger3 = callPackage ../applications/office/ledger { - boost = boost155; - }; + ledger3 = callPackage ../applications/office/ledger { }; ledger = self.ledger3; ledger-web = callPackage ../applications/office/ledger-web { };