diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-04-28 11:50:57 +1000 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-04-28 20:30:29 +1000 |
| commit | b5dc07a4b471e6f651af3b13e4bd841b6b3ea6ed (patch) | |
| tree | 77df5bd7e3c972e12a022ca5fc437c8f67ce9092 /pkgs/desktops/deepin | |
| parent | c59c4e358989ce49afd177e6899549fbb8f8bf7f (diff) | |
| download | nixlib-b5dc07a4b471e6f651af3b13e4bd841b6b3ea6ed.tar nixlib-b5dc07a4b471e6f651af3b13e4bd841b6b3ea6ed.tar.gz nixlib-b5dc07a4b471e6f651af3b13e4bd841b6b3ea6ed.tar.bz2 nixlib-b5dc07a4b471e6f651af3b13e4bd841b6b3ea6ed.tar.lz nixlib-b5dc07a4b471e6f651af3b13e4bd841b6b3ea6ed.tar.xz nixlib-b5dc07a4b471e6f651af3b13e4bd841b6b3ea6ed.tar.zst nixlib-b5dc07a4b471e6f651af3b13e4bd841b6b3ea6ed.zip | |
treewide: use $out instead of $bin with buildGoPackage
Diffstat (limited to 'pkgs/desktops/deepin')
| -rw-r--r-- | pkgs/desktops/deepin/dde-api/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/deepin/dde-daemon/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/deepin/startdde/default.nix | 4 |
3 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix index 9fb18d04df82..accc7e2b701d 100644 --- a/pkgs/desktops/deepin/dde-api/default.nix +++ b/pkgs/desktops/deepin/dde-api/default.nix @@ -37,8 +37,6 @@ buildGoPackage rec { goDeps = ./deps.nix; - outputs = [ "out" ]; - nativeBuildInputs = [ pkgconfig deepin-gettext-tools # build @@ -109,7 +107,7 @@ buildGoPackage rec { installPhase = '' make install PREFIX="$out" SYSTEMD_LIB_DIR="$out/lib" -C go/src/${goPackagePath} mv $out/share/gocode $out/share/go - remove-references-to -t ${go} $out/bin/* $out/lib/deepin-api/* + remove-references-to -t ${go} $out/lib/deepin-api/* ''; postFixup = '' diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix index fdbb7856b063..ad818b2606c0 100644 --- a/pkgs/desktops/deepin/dde-daemon/default.nix +++ b/pkgs/desktops/deepin/dde-daemon/default.nix @@ -29,8 +29,6 @@ buildGoPackage rec { goDeps = ./deps.nix; - outputs = [ "out" ]; - nativeBuildInputs = [ pkgconfig dbus-factory diff --git a/pkgs/desktops/deepin/startdde/default.nix b/pkgs/desktops/deepin/startdde/default.nix index 3050e7b9e13c..137417f3754e 100644 --- a/pkgs/desktops/deepin/startdde/default.nix +++ b/pkgs/desktops/deepin/startdde/default.nix @@ -22,8 +22,6 @@ buildGoPackage rec { goDeps = ./deps.nix; - outputs = [ "out" ]; - nativeBuildInputs = [ pkgconfig dbus-factory @@ -114,7 +112,7 @@ buildGoPackage rec { installPhase = '' make install PREFIX="$out" -C go/src/${goPackagePath} rm -rf $out/share/lightdm # this is uselesss for NixOS - remove-references-to -t ${go} $out/bin/* $out/sbin/* + remove-references-to -t ${go} $out/sbin/* ''; postFixup = '' |