diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-01-11 23:37:02 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-01-11 23:41:30 +0000 |
| commit | 6c557e3f1c28cf87e9fba232811d6875dd1399c1 (patch) | |
| tree | 035a071d5d8980df6de0fa42e2ef8fc0cce7055e /nixpkgs/pkgs/development/libraries/mesa/stubs.nix | |
| parent | da7500bc026e937ac7fce7b50f67a0e1765737a7 (diff) | |
| parent | e4134747f5666bcab8680aff67fa3b63384f9a0f (diff) | |
| download | nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.gz nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.bz2 nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.lz nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.xz nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.zst nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.zip | |
Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/mesa/stubs.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/mesa/stubs.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/mesa/stubs.nix b/nixpkgs/pkgs/development/libraries/mesa/stubs.nix index 5cb6ac3d4d13..a53f2dc28e77 100644 --- a/nixpkgs/pkgs/development/libraries/mesa/stubs.nix +++ b/nixpkgs/pkgs/development/libraries/mesa/stubs.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { ln -s ${libglvnd.out}/lib $out/lib mkdir -p $dev/{,lib/pkgconfig,nix-support} - echo "$out" > $dev/nix-support/propagated-build-inputs + echo "$out ${libglvnd} ${libglvnd.dev}" > $dev/nix-support/propagated-build-inputs ln -s ${mesa.dev}/include $dev/include genPkgConfig() { @@ -63,7 +63,7 @@ stdenv.mkDerivation { Description: $lib library Version: ${mesa.version} Libs: -L${libglvnd.out}/lib -l$lib - Cflags: -I${mesa.dev}/include + Cflags: -I${mesa.dev}/include -I${libglvnd.dev}/include EOF } |