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

swig: Make 3.x the default

Browse Source
This commit is contained in:
William A. Kennington III 2015-07-17 14:15:51 -07:00
parent f74c74ec40
commit 1163946659
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5706,12 +5706,10 @@ let
strace = callPackage ../development/tools/misc/strace { }; strace = callPackage ../development/tools/misc/strace { };
swig = callPackage ../development/tools/misc/swig { }; swig1 = callPackage ../development/tools/misc/swig { };
swig2 = callPackage ../development/tools/misc/swig/2.x.nix { }; swig2 = callPackage ../development/tools/misc/swig/2.x.nix { };
swig3 = callPackage ../development/tools/misc/swig/3.x.nix { }; swig3 = callPackage ../development/tools/misc/swig/3.x.nix { };
swig = swig3;
swigWithJava = swig; swigWithJava = swig;
swfmill = callPackage ../tools/video/swfmill { }; swfmill = callPackage ../tools/video/swfmill { };
@ -9291,7 +9289,7 @@ let
perl = perl516; # ${perl}/.../CORE/handy.h:124:34: error: 'bool' undeclared perl = perl516; # ${perl}/.../CORE/handy.h:124:34: error: 'bool' undeclared
}; };
apparmor_2_9 = callPackage ../os-specific/linux/apparmor/2.9 { swig = swig2; }; apparmor_2_9 = callPackage ../os-specific/linux/apparmor/2.9 { };
libapparmor = apparmor_2_9.libapparmor; libapparmor = apparmor_2_9.libapparmor;
apparmor-pam = apparmor_2_9.apparmor-pam; apparmor-pam = apparmor_2_9.apparmor-pam;
apparmor-parser = apparmor_2_9.apparmor-parser; apparmor-parser = apparmor_2_9.apparmor-parser;