diff options
author | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
---|---|---|
committer | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
commit | 80d90d9b204f7c17912740f9f414fe5d59f293ba (patch) | |
tree | 5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/pkgs/development/go-packages/generic/default.nix | |
parent | 3a31a84c7d3e589035ad08499206aac44a81f424 (diff) | |
parent | 83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff) |
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/go-packages/generic/default.nix')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/go-packages/generic/default.nix | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/go-packages/generic/default.nix b/infra/libkookie/nixpkgs/pkgs/development/go-packages/generic/default.nix index 5c54e04652f7..ab8ee9166f98 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/go-packages/generic/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/go-packages/generic/default.nix @@ -1,5 +1,5 @@ { go, govers, lib, fetchgit, fetchhg, fetchbzr, rsync -, removeReferencesTo, fetchFromGitHub, stdenv }: +, fetchFromGitHub, stdenv }: { buildInputs ? [] , nativeBuildInputs ? [] @@ -44,10 +44,6 @@ with builtins; let - removeReferences = [ ] ++ lib.optional (!allowGoReference) go; - - removeExpr = refs: ''remove-references-to ${lib.concatMapStrings (ref: " -t ${ref}") refs}''; - dep2src = goDep: { inherit (goDep) goPackagePath; @@ -78,7 +74,7 @@ let package = stdenv.mkDerivation ( (builtins.removeAttrs args [ "goPackageAliases" "disabled" "extraSrcs"]) // { - nativeBuildInputs = [ removeReferencesTo go ] + nativeBuildInputs = [ go ] ++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs; buildInputs = buildInputs; @@ -88,6 +84,7 @@ let GOHOSTOS = go.GOHOSTOS or null; GO111MODULE = "off"; + GOFLAGS = lib.optionals (!allowGoReference) [ "-trimpath" ]; GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); @@ -225,10 +222,6 @@ let runHook postInstall ''; - preFixup = preFixup + '' - find $out/{bin,libexec,lib} -type f 2>/dev/null | xargs -r ${removeExpr removeReferences} || true - ''; - strictDeps = true; shellHook = '' |