dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix .deepOverride on poppler, glib

Browse Source 
By moving the default derivation into callPackage call, close #1115.
This commit is contained in:
Marc Weber 2013-10-24 18:08:48 +02:00 committed by Vladimír Čunát
parent a13ed71b43
commit 78f7baf3b7
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/dbus/default.nix
View File

@ -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 # This package has been split because most applications only need dbus.lib
# which serves as an interface to a *system-wide* daemon, # which serves as an interface to a *system-wide* daemon,
@ -114,4 +115,5 @@ in rec {
docs = dbus_drv "docs" "doc" { docs = dbus_drv "docs" "doc" {
postInstall = ''rm -r "$out/lib"''; postInstall = ''rm -r "$out/lib"'';
}; };
} };
in attrs.libs // attrs

4
pkgs/development/libraries/poppler/default.nix
View File

@ -54,7 +54,6 @@ let
}; };
} merge ]); # poppler_drv } merge ]); # poppler_drv
in rec {
/* We always use cairo in poppler, so we always depend on glib, /* We always use cairo in poppler, so we always depend on glib,
so we always build the glib wrapper (~350kB). so we always build the glib wrapper (~350kB).
We also always build the cpp wrapper (<100kB). We also always build the cpp wrapper (<100kB).
@ -69,4 +68,5 @@ in rec {
NIX_LDFLAGS = "-lpoppler"; NIX_LDFLAGS = "-lpoppler";
postConfigure = "cd qt4"; postConfigure = "cd qt4";
}; };
}
in { inherit poppler_glib poppler_qt4; } // poppler_glib

6
pkgs/top-level/all-packages.nix
View File

@ -4008,8 +4008,7 @@ let
db48 = callPackage ../development/libraries/db4/db4-4.8.nix { }; db48 = callPackage ../development/libraries/db4/db4-4.8.nix { };
dbus = let dbus_all = callPackage ../development/libraries/dbus { }; dbus = callPackage ../development/libraries/dbus { };
in dbus_all.libs // dbus_all; # previously dbus.libs also contained the daemon
dbus_cplusplus = callPackage ../development/libraries/dbus-cplusplus { }; dbus_cplusplus = callPackage ../development/libraries/dbus-cplusplus { };
dbus_glib = callPackage ../development/libraries/dbus-glib { }; dbus_glib = callPackage ../development/libraries/dbus-glib { };
dbus_java = callPackage ../development/libraries/java/dbus-java { }; dbus_java = callPackage ../development/libraries/java/dbus-java { };
@ -5394,8 +5393,7 @@ let
policykit = callPackage ../development/libraries/policykit { }; policykit = callPackage ../development/libraries/policykit { };
poppler = let popplers = callPackage ../development/libraries/poppler { lcms = lcms2; }; poppler = callPackage ../development/libraries/poppler { lcms = lcms2; };
in popplers // popplers.poppler_glib;
popplerQt4 = poppler.poppler_qt4; popplerQt4 = poppler.poppler_qt4;
poppler_0_18 = callPackage ../development/libraries/poppler/0.18.nix { poppler_0_18 = callPackage ../development/libraries/poppler/0.18.nix {