diff options
author | Marc Weber <marco-oweber@gmx.de> | 2013-10-24 18:08:48 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-10-26 13:54:24 +0200 |
commit | 78f7baf3b70874668763059ece96bae6cf68d0b4 (patch) | |
tree | bd36c123d466e707af812b8334b1fc379708b802 /pkgs | |
parent | a13ed71b432c2f54ab3f9feaf71859af3cc0fce6 (diff) | |
download | nixlib-78f7baf3b70874668763059ece96bae6cf68d0b4.tar nixlib-78f7baf3b70874668763059ece96bae6cf68d0b4.tar.gz nixlib-78f7baf3b70874668763059ece96bae6cf68d0b4.tar.bz2 nixlib-78f7baf3b70874668763059ece96bae6cf68d0b4.tar.lz nixlib-78f7baf3b70874668763059ece96bae6cf68d0b4.tar.xz nixlib-78f7baf3b70874668763059ece96bae6cf68d0b4.tar.zst nixlib-78f7baf3b70874668763059ece96bae6cf68d0b4.zip |
Fix .deepOverride on poppler, glib
By moving the default derivation into callPackage call, close #1115.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/dbus/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/poppler/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index b47e3c4a0e07..8ec47f86e343 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -77,7 +77,8 @@ let }); -in rec { + attrs = rec { + # If you change much fix indentation # This package has been split because most applications only need dbus.lib # which serves as an interface to a *system-wide* daemon, @@ -114,4 +115,5 @@ in rec { docs = dbus_drv "docs" "doc" { postInstall = ''rm -r "$out/lib"''; }; -} +}; +in attrs.libs // attrs diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 6b8fb898d90d..9cd094855d24 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -54,7 +54,6 @@ let }; } merge ]); # poppler_drv -in rec { /* We always use cairo in poppler, so we always depend on glib, so we always build the glib wrapper (~350kB). We also always build the cpp wrapper (<100kB). @@ -69,4 +68,5 @@ in rec { NIX_LDFLAGS = "-lpoppler"; postConfigure = "cd qt4"; }; -} + +in { inherit poppler_glib poppler_qt4; } // poppler_glib diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1169d3db088c..312657d466e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4008,8 +4008,7 @@ let db48 = callPackage ../development/libraries/db4/db4-4.8.nix { }; - dbus = let dbus_all = callPackage ../development/libraries/dbus { }; - in dbus_all.libs // dbus_all; # previously dbus.libs also contained the daemon + dbus = callPackage ../development/libraries/dbus { }; dbus_cplusplus = callPackage ../development/libraries/dbus-cplusplus { }; dbus_glib = callPackage ../development/libraries/dbus-glib { }; dbus_java = callPackage ../development/libraries/java/dbus-java { }; @@ -5394,8 +5393,7 @@ let policykit = callPackage ../development/libraries/policykit { }; - poppler = let popplers = callPackage ../development/libraries/poppler { lcms = lcms2; }; - in popplers // popplers.poppler_glib; + poppler = callPackage ../development/libraries/poppler { lcms = lcms2; }; popplerQt4 = poppler.poppler_qt4; poppler_0_18 = callPackage ../development/libraries/poppler/0.18.nix { |