diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-09-16 08:40:47 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-09-16 08:40:47 +0000 |
commit | bd6da9f5f3e7799bc39e3f01b8b4081663971d34 (patch) | |
tree | a0bd07d0444d47d1675fc9b5ece9f54a889fa56b | |
parent | 4e5db40581ed97ec8b7c6d61187f47e5948a3226 (diff) |
Use stdenv2 in podofo
svn path=/nixpkgs/trunk/; revision=23817
-rw-r--r-- | pkgs/development/libraries/podofo/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index 99765f933b635..0d18c37987eef 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/podofo/${name}.tar.gz"; sha256 = "064cgrvjvy57n5i25d4j7yx5wd3wgkdks448bzc3a8nsmyl08skq"; }; - buildInputs = [ cmake zlib freetype libjpeg libtiff fontconfig openssl libpng - lua5 stdenv.gcc.libc ]; + propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng ]; + buildInputs = [ cmake lua5 stdenv.gcc.libc ]; cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF"; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4abe8821d419f..7352846bb554e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3608,7 +3608,9 @@ let plib = callPackage ../development/libraries/plib { }; - podofo = callPackage ../development/libraries/podofo { }; + podofo = callPackage ../development/libraries/podofo { + stdenv = stdenv2; + }; polkit = callPackage ../development/libraries/polkit { }; |