diff options
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/compilers/ghc/6.10.2-binary.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-4.x/4.8/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix index 5a3ddc97587e..b3208209b05b 100644 --- a/pkgs/development/compilers/ghc/6.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { '' else ""); configurePhase = '' - ./configure --prefix=$out --with-gmp-libraries=${gmp.out}/lib --with-gmp-includes=${gmp.dev}/include + ./configure --prefix=$out --with-gmp-libraries=${gmp.out}/lib --with-gmp-includes=${gmp.dev or gmp}/include ''; # Stripping combined with patchelf breaks the executables (they die diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 07a7993a67fe..788fb8741402 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ./libressl.patch (substituteAll { src = ./dlopen-absolute-paths.diff; - cups = cups.out; + cups = if cups != null then cups.out else null; icu = icu.out; libXfixes = libXfixes.out; glibc = stdenv.cc.libc.out; |