public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bad merge

Browse Source
This commit is contained in:
Vladimír Čunát 2013-02-02 21:22:11 +01:00
parent 35a927149f
commit 7943a3c648
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/top-level/all-packages.nix
View File

@ -4606,9 +4606,6 @@ let
else callPackage ../development/libraries/mesa-glu { }; # mesa *with* GL/glu.h else callPackage ../development/libraries/mesa-glu { }; # mesa *with* GL/glu.h
darwinX11AndOpenGL = callPackage ../os-specific/darwin/native-x11-and-opengl { }; darwinX11AndOpenGL = callPackage ../os-specific/darwin/native-x11-and-opengl { };
mesa = if stdenv.isDarwin then darwinX11AndOpenGL else
callPackage ../development/libraries/mesa { };
metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec { metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec {
sdfLibrary = callPackage ../development/libraries/sdf-library { aterm = aterm28; }; sdfLibrary = callPackage ../development/libraries/sdf-library { aterm = aterm28; };
toolbuslib = callPackage ../development/libraries/toolbuslib { aterm = aterm28; inherit (windows) w32api; }; toolbuslib = callPackage ../development/libraries/toolbuslib { aterm = aterm28; inherit (windows) w32api; };