diff options
author | Alexander V. Nikolaev <avn@avnik.info> | 2018-02-24 15:12:44 +0200 |
---|---|---|
committer | Alexander V. Nikolaev <avn@avnik.info> | 2018-02-24 17:06:49 +0200 |
commit | 0acec7e984ff38b7a296a459ba4b539a3b719c1b (patch) | |
tree | 1d60ce67493ab87f80acb127f4e26a11a0324c28 /pkgs/development/libraries/libqtav/default.nix | |
parent | 1bc1909e5b89ec8d0e4ecadcbb5c66de0cb4fb5a (diff) | |
download | nixpkgs-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar nixpkgs-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar.gz nixpkgs-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar.bz2 nixpkgs-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar.lz nixpkgs-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar.xz nixpkgs-0acec7e984ff38b7a296a459ba4b539a3b719c1b.tar.zst nixpkgs-0acec7e984ff38b7a296a459ba4b539a3b719c1b.zip |
treewide: transition mesa to libGLU_combined
Diffstat (limited to 'pkgs/development/libraries/libqtav/default.nix')
-rw-r--r-- | pkgs/development/libraries/libqtav/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix index 93d8ced49ce..b291ec2fdf0 100644 --- a/pkgs/development/libraries/libqtav/default.nix +++ b/pkgs/development/libraries/libqtav/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchFromGitHub, extra-cmake-modules , qtbase, qtmultimedia, qtquick1, qttools -, mesa, libX11 +, libGLU_combined, libX11 , libass, openal, ffmpeg, libuchardet , alsaLib, libpulseaudio, libva }: @@ -14,7 +14,7 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ qtbase qtmultimedia qtquick1 - mesa libX11 + libGLU_combined libX11 libass openal ffmpeg libuchardet alsaLib libpulseaudio libva ]; @@ -28,9 +28,9 @@ mkDerivation rec { }; # Make sure libqtav finds its libGL dependancy at both link and run time - # by adding mesa to rpath. Not sure why it wasn't done automatically like - # the other libraries as `mesa` is part of our `buildInputs`. - NIX_CFLAGS_LINK = [ "-Wl,-rpath,${mesa}/lib"]; + # by adding libGLU_combined to rpath. Not sure why it wasn't done automatically like + # the other libraries as `libGLU_combined` is part of our `buildInputs`. + NIX_CFLAGS_LINK = [ "-Wl,-rpath,${libGLU_combined}/lib"]; preFixup = '' mkdir -p "$out/bin" |