From 3a6ba8959eef78d1ea80ea6724a56b92bb81d4d1 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Tue, 5 Mar 2019 17:23:11 -0800 Subject: [PATCH] deepin: remove the temporary go_1_11 assignment to go --- pkgs/desktops/deepin/default.nix | 12 +++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 4c0e44f6b72..4fe787bc5d4 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -1,19 +1,13 @@ -{ pkgs, makeScope, libsForQt5, go_1_11 }: +{ pkgs, makeScope, libsForQt5 }: let packages = self: with self; { updateScript = callPackage ./update.nix { }; dbus-factory = callPackage ./dbus-factory { }; - dde-api = callPackage ./dde-api { - # XXX: the build is finding references to Go when compiled with go v1.12 - go = go_1_11; - }; + dde-api = callPackage ./dde-api { }; dde-calendar = callPackage ./dde-calendar { }; - dde-daemon = callPackage ./dde-daemon { - # XXX: the build is finding references to Go when compiled with go v1.12 - go = go_1_11; - }; + dde-daemon = callPackage ./dde-daemon { }; dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { }; dde-session-ui = callPackage ./dde-session-ui { }; deepin-desktop-base = callPackage ./deepin-desktop-base { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e478aba8b8..fe6d51b09c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21313,7 +21313,7 @@ in clearlooks-phenix = callPackage ../misc/themes/clearlooks-phenix { }; deepin = recurseIntoAttrs (import ../desktops/deepin { - inherit pkgs libsForQt5 go_1_11; + inherit pkgs libsForQt5; inherit (lib) makeScope; });