From c7594c1c426a42832c0894903ff5689a4f6a2b30 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sat, 21 Apr 2018 23:39:19 +0200 Subject: =?UTF-8?q?=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bragi.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'bragi.nix') diff --git a/bragi.nix b/bragi.nix index cbc04bf0..f2b464d1 100644 --- a/bragi.nix +++ b/bragi.nix @@ -94,11 +94,8 @@ in rec { inherit (lib.mapAttrs (name: superPkgs.haskell.lib.dontCheck) superH) Glob filelock hedgehog; - inherit - (selfH.callPackage ./custom/thermoprint { inherit (superPkgs) runCommand makeWrapper; extraPackages = (p: with p; [ persistent-postgresql ]); }) - thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode; bar = superPkgs.callPackage ./bragi/bar { haskellPackages = selfH; }; - }); + } // (import ./custom/thermoprint { callPackage = superPkgs.lib.callPackageWith (selfH // { import (superH) makeWrapper runCommand; }); extraPackages = (p: with p; [ persistent-postgresql ]); })); jack2Full = superPkgs.jack2Full.override { dbus = null; }; -- cgit v1.2.3