diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-02-02 21:22:11 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-02-02 21:22:11 +0100 |
| commit | 7943a3c648f54a4a9b73e5eed627dbb030e2ea79 (patch) | |
| tree | a74df2d17c0b39d18f0f8e39d29997f10fbec06f | |
| parent | 35a927149feea9239f958eace2b36124e7e1b3d7 (diff) | |
| download | nixlib-7943a3c648f54a4a9b73e5eed627dbb030e2ea79.tar nixlib-7943a3c648f54a4a9b73e5eed627dbb030e2ea79.tar.gz nixlib-7943a3c648f54a4a9b73e5eed627dbb030e2ea79.tar.bz2 nixlib-7943a3c648f54a4a9b73e5eed627dbb030e2ea79.tar.lz nixlib-7943a3c648f54a4a9b73e5eed627dbb030e2ea79.tar.xz nixlib-7943a3c648f54a4a9b73e5eed627dbb030e2ea79.tar.zst nixlib-7943a3c648f54a4a9b73e5eed627dbb030e2ea79.zip | |
fix bad merge
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b5ffabd80aed..68a46f64a88b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4606,9 +4606,6 @@ let else callPackage ../development/libraries/mesa-glu { }; # mesa *with* GL/glu.h 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 { sdfLibrary = callPackage ../development/libraries/sdf-library { aterm = aterm28; }; toolbuslib = callPackage ../development/libraries/toolbuslib { aterm = aterm28; inherit (windows) w32api; }; |