From ea50da90419ef7e44fabcaccfc0865bf7a6b0587 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Dec 2014 13:43:42 +0100 Subject: [PATCH] haskell-libnotify: re-generate with cabal2nix (and override reference to pkgs.libnotify) --- pkgs/development/libraries/haskell/libnotify/default.nix | 4 ++-- pkgs/top-level/haskell-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/libnotify/default.nix b/pkgs/development/libraries/haskell/libnotify/default.nix index a49de8cd700e..8ed4e80d49f3 100644 --- a/pkgs/development/libraries/haskell/libnotify/default.nix +++ b/pkgs/development/libraries/haskell/libnotify/default.nix @@ -1,13 +1,13 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, glib, gtk, pkgs }: +{ cabal, glib, gtk, libnotify }: cabal.mkDerivation (self: { pname = "libnotify"; version = "0.1.1.0"; sha256 = "1wc19v14agadj7dzi81lm3qzk2x33apaj5ylmg7x232k56xzfvr0"; buildDepends = [ glib gtk ]; - extraLibraries = [ pkgs.libnotify ]; + extraLibraries = [ libnotify ]; meta = { description = "Bindings to libnotify library"; license = self.stdenv.lib.licenses.mit; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 04896aaa90e0..22a37a0061af 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1558,7 +1558,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in libmpd = callPackage ../development/libraries/haskell/libmpd {}; - libnotify = callPackage ../development/libraries/haskell/libnotify {}; + libnotify = callPackage ../development/libraries/haskell/libnotify { inherit (pkgs) libnotify; }; liblastfm = callPackage ../development/libraries/haskell/liblastfm {};