1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 08:01:14 +00:00

Merge pull request #33596 from yegortimoshenko/20180108.033429/wine

wine: wineStaging -> wine-staging, add wine-development, use full scheme for wine-stable
This commit is contained in:
Yegor Timoshenko 2018-04-20 13:04:29 +03:00 committed by GitHub
commit a731dfce68
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions

View file

@ -228,6 +228,7 @@ mapAliases (rec {
vimprobable2Wrapper = vimprobable2; # added 2015-01
virtviewer = virt-viewer; # added 2015-12-24
vorbisTools = vorbis-tools; # added 2016-01-26
wineStaging = wine-staging; # added 2018-01-08
winusb = woeusb; # added 2017-12-22
x11 = xlibsWrapper; # added 2015-09
xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09

View file

@ -21043,9 +21043,9 @@ with pkgs;
staging = base.override { wineRelease = "staging"; };
};
wine = winePackages.base;
wine = winePackages.full;
wineStaging = lowPrio (winePackages.full.override {
wine-staging = lowPrio (winePackages.full.override {
wineRelease = "staging";
});