diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-06 13:23:53 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-13 20:18:47 +0200 |
| commit | 11970039665563b9c8e872b55205cf8f679b0203 (patch) | |
| tree | bbace93ad9f96c87dafe2a6cfa012ea9b5ce4d23 /pkgs/applications | |
| parent | b9d2c364a12c7f3f8b654987bad34c678b388af6 (diff) | |
| download | nixpkgs-11970039665563b9c8e872b55205cf8f679b0203.tar nixpkgs-11970039665563b9c8e872b55205cf8f679b0203.tar.gz nixpkgs-11970039665563b9c8e872b55205cf8f679b0203.tar.bz2 nixpkgs-11970039665563b9c8e872b55205cf8f679b0203.tar.lz nixpkgs-11970039665563b9c8e872b55205cf8f679b0203.tar.xz nixpkgs-11970039665563b9c8e872b55205cf8f679b0203.tar.zst nixpkgs-11970039665563b9c8e872b55205cf8f679b0203.zip | |
fix references to ${libtool}/lib
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/misc/xca/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/bochs/default.nix | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index 76de3627630..64b9009f152 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/xca" \ - --prefix LD_LIBRARY_PATH : "${qt4}/lib:${gcc.cc}/lib:${gcc.cc}/lib64:${openssl}/lib:${libtool}/lib" + --prefix LD_LIBRARY_PATH : \ + "${gcc.cc.lib}/lib64:${stdenv.lib.makeLibraryPath [ qt4 gcc.cc openssl libtool ]}" ''; buildInputs = [ openssl qt4 libtool gcc makeWrapper ]; diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index b876403d632..d1150d7024b 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -143,8 +143,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional busMouse "--enable-busmouse" ; - NIX_CFLAGS_COMPILE="-I${gtk}/include/gtk-2.0/ -I${libtool}/include/"; - NIX_LDFLAGS="-L${libtool}/lib"; + NIX_CFLAGS_COMPILE="-I${gtk.dev}/include/gtk-2.0/ -I${libtool}/include/"; + NIX_LDFLAGS="-L${libtool.lib}/lib"; meta = with stdenv.lib; { description = "An open-source IA-32 (x86) PC emulator"; |