diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2019-02-27 13:24:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-27 13:24:13 +0000 |
| commit | d389e5206c2d2e91891ce9e725dec49c8d6dc5be (patch) | |
| tree | 9a5f391d44db6428a0c6c31a834a57ac221a64d1 /pkgs/top-level | |
| parent | 8913ba2a8dd8521d1bbce2d7ae29ba3420a3782b (diff) | |
| parent | 3298c38a6dc92fd1b544f871f7665c9f65ca5240 (diff) | |
| download | nixlib-d389e5206c2d2e91891ce9e725dec49c8d6dc5be.tar nixlib-d389e5206c2d2e91891ce9e725dec49c8d6dc5be.tar.gz nixlib-d389e5206c2d2e91891ce9e725dec49c8d6dc5be.tar.bz2 nixlib-d389e5206c2d2e91891ce9e725dec49c8d6dc5be.tar.lz nixlib-d389e5206c2d2e91891ce9e725dec49c8d6dc5be.tar.xz nixlib-d389e5206c2d2e91891ce9e725dec49c8d6dc5be.tar.zst nixlib-d389e5206c2d2e91891ce9e725dec49c8d6dc5be.zip | |
Merge pull request #56317 from yrashk/ogre-1.11.5
ogre: 1.10.11 -> 1.11.5
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b096b9b00e93..e26fe4f6ebfc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9524,7 +9524,9 @@ in celt_0_7 = callPackage ../development/libraries/celt/0.7.nix {}; celt_0_5_1 = callPackage ../development/libraries/celt/0.5.1.nix {}; - cegui = callPackage ../development/libraries/cegui {}; + cegui = callPackage ../development/libraries/cegui { + ogre = ogre1_10; + }; certbot = callPackage ../tools/admin/certbot { }; @@ -11854,6 +11856,7 @@ in ogre = callPackage ../development/libraries/ogre {}; ogre1_9 = callPackage ../development/libraries/ogre/1.9.x.nix {}; + ogre1_10 = callPackage ../development/libraries/ogre/1.10.x.nix {}; ogrepaged = callPackage ../development/libraries/ogrepaged { }; |