cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

deepin: remove the temporary go_1_11 assignment to go

Browse source
This commit is contained in:
Wael M. Nasreddine 2019-03-05 17:23:11 -08:00
parent 2e86ada823
commit 3a6ba8959e
No known key found for this signature in database
GPG key ID: FD437548E0BF0F5F
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/desktops/deepin/default.nix
View file

@ -1,19 +1,13 @@
{ pkgs, makeScope, libsForQt5, go_1_11 }: { pkgs, makeScope, libsForQt5 }:
let let
packages = self: with self; { packages = self: with self; {
updateScript = callPackage ./update.nix { }; updateScript = callPackage ./update.nix { };
dbus-factory = callPackage ./dbus-factory { }; dbus-factory = callPackage ./dbus-factory { };
dde-api = callPackage ./dde-api { dde-api = callPackage ./dde-api { };
# XXX: the build is finding references to Go when compiled with go v1.12
go = go_1_11;
};
dde-calendar = callPackage ./dde-calendar { }; dde-calendar = callPackage ./dde-calendar { };
dde-daemon = callPackage ./dde-daemon { dde-daemon = callPackage ./dde-daemon { };
# XXX: the build is finding references to Go when compiled with go v1.12
go = go_1_11;
};
dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { }; dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { };
dde-session-ui = callPackage ./dde-session-ui { }; dde-session-ui = callPackage ./dde-session-ui { };
deepin-desktop-base = callPackage ./deepin-desktop-base { }; deepin-desktop-base = callPackage ./deepin-desktop-base { };

2
pkgs/top-level/all-packages.nix
View file

@ -21313,7 +21313,7 @@ in
clearlooks-phenix = callPackage ../misc/themes/clearlooks-phenix { }; clearlooks-phenix = callPackage ../misc/themes/clearlooks-phenix { };
deepin = recurseIntoAttrs (import ../desktops/deepin { deepin = recurseIntoAttrs (import ../desktops/deepin {
inherit pkgs libsForQt5 go_1_11; inherit pkgs libsForQt5;
inherit (lib) makeScope; inherit (lib) makeScope;
}); });