diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-09-15 11:26:18 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-09-15 12:54:34 +0200 |
| commit | 88c9f8b574ead01e32c5ee5228679723343cd52c (patch) | |
| tree | 92196d2055a7842ae40c022581220bace87ab9e1 /pkgs/development/haskell-modules/default.nix | |
| parent | 21e3ff658ac2d7b7986169f31550aa5f65bb7635 (diff) | |
| download | nixpkgs-88c9f8b574ead01e32c5ee5228679723343cd52c.tar nixpkgs-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.gz nixpkgs-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.bz2 nixpkgs-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.lz nixpkgs-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.xz nixpkgs-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.zst nixpkgs-88c9f8b574ead01e32c5ee5228679723343cd52c.zip | |
xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc. - Avoided renaming local (and different) xlibs binding in gcc*. - Fixed cases where both xorg and xlibs were used. Hopefully everything still works as before.
Diffstat (limited to 'pkgs/development/haskell-modules/default.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 7e6f1c0552d..81687bd56a2 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -43,7 +43,7 @@ let overrideScope = f: callPackageWithScope (mkScope (fix (extend scope.__unfix__ f))) drv args; }; - mkScope = scope: pkgs // pkgs.xlibs // pkgs.gnome // scope; + mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome // scope; defaultScope = mkScope self; callPackage = drv: args: callPackageWithScope defaultScope drv args; |