diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-06-11 02:05:00 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-06-11 02:05:00 +0000 |
commit | 926765c5e37121c0aeda891d185cfaa44f8dd237 (patch) | |
tree | b1167f09014315b41034ffec262fd16ad37bfa36 /pkgs/tools/graphics | |
parent | f023076314c6ffa2ebd8017c31ce7b1f18e44a79 (diff) | |
parent | dcfc50245878e2eedca9cda9c8cee6c6dcd81a1b (diff) | |
download | nixpkgs-926765c5e37121c0aeda891d185cfaa44f8dd237.tar nixpkgs-926765c5e37121c0aeda891d185cfaa44f8dd237.tar.gz nixpkgs-926765c5e37121c0aeda891d185cfaa44f8dd237.tar.bz2 nixpkgs-926765c5e37121c0aeda891d185cfaa44f8dd237.tar.lz nixpkgs-926765c5e37121c0aeda891d185cfaa44f8dd237.tar.xz nixpkgs-926765c5e37121c0aeda891d185cfaa44f8dd237.tar.zst nixpkgs-926765c5e37121c0aeda891d185cfaa44f8dd237.zip |
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts: pkgs/servers/http/apache-httpd/2.4.nix
Diffstat (limited to 'pkgs/tools/graphics')
-rw-r--r-- | pkgs/tools/graphics/mesa-demos/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/tools/graphics/mesa-demos/default.nix b/pkgs/tools/graphics/mesa-demos/default.nix index 14b7a038a13..550b06d0f0e 100644 --- a/pkgs/tools/graphics/mesa-demos/default.nix +++ b/pkgs/tools/graphics/mesa-demos/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ freeglut glew libX11 libXext libGL libGLU mesa mesa.osmesa wayland ]; nativeBuildInputs = [ pkg-config ]; + configureFlags = [ "--with-system-data-files" ]; enableParallelBuilding = true; meta = with lib; { |