ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 14:22:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #96538 from Mic92/go-references

Browse Source 
buildGoModule/buildGoPackage: Remove go references from lib,libexec
This commit is contained in:
Linus Heckemann 2020-08-30 16:44:08 +02:00 committed by GitHub
commit bba8571c39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/virtualization/docker/default.nix
View File

@ -180,7 +180,7 @@ rec {
''; '';
preFixup = '' preFixup = ''
find $out -type f -exec remove-references-to -t ${go} -t ${stdenv.cc.cc} '{}' + find $out -type f -exec remove-references-to -t ${stdenv.cc.cc} '{}' +
'' + optionalString (stdenv.isLinux) '' '' + optionalString (stdenv.isLinux) ''
find $out -type f -exec remove-references-to -t ${stdenv.glibc.dev} '{}' + find $out -type f -exec remove-references-to -t ${stdenv.glibc.dev} '{}' +
''; '';

4
pkgs/applications/virtualization/singularity/default.nix
View File

@ -67,10 +67,6 @@ buildGoPackage rec {
runHook postInstall runHook postInstall
''; '';
postFixup = ''
find $out/libexec/ -type f -executable -exec remove-references-to -t ${go} '{}' + || true
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "http://www.sylabs.io/"; homepage = "http://www.sylabs.io/";
description = "Application containers for linux"; description = "Application containers for linux";

1
pkgs/desktops/deepin/dde-api/default.nix
View File

@ -108,7 +108,6 @@ buildGoPackage rec {
installPhase = '' installPhase = ''
make install PREFIX="$out" SYSTEMD_LIB_DIR="$out/lib" -C go/src/${goPackagePath} make install PREFIX="$out" SYSTEMD_LIB_DIR="$out/lib" -C go/src/${goPackagePath}
mv $out/share/gocode $out/share/go mv $out/share/gocode $out/share/go
remove-references-to -t ${go} $out/lib/deepin-api/*
''; '';
postFixup = '' postFixup = ''

1
pkgs/desktops/deepin/dde-daemon/default.nix
View File

@ -134,7 +134,6 @@ buildGoPackage rec {
installPhase = '' installPhase = ''
make install PREFIX="$out" -C go/src/${goPackagePath} make install PREFIX="$out" -C go/src/${goPackagePath}
remove-references-to -t ${go} $out/lib/deepin-daemon/*
searchHardCodedPaths $out searchHardCodedPaths $out
''; '';

1
pkgs/desktops/deepin/startdde/default.nix
View File

@ -139,7 +139,6 @@ buildGoPackage rec {
installPhase = '' installPhase = ''
make install PREFIX="$out" -C go/src/${goPackagePath} make install PREFIX="$out" -C go/src/${goPackagePath}
rm -rf $out/share/lightdm # this is uselesss for NixOS rm -rf $out/share/lightdm # this is uselesss for NixOS
remove-references-to -t ${go} $out/sbin/*
''; '';
postFixup = '' postFixup = ''

2
pkgs/development/go-modules/generic/default.nix
View File

@ -235,7 +235,7 @@ let
''; '';
preFixup = (args.preFixup or "") + '' preFixup = (args.preFixup or "") + ''
find $out/bin -type f -exec ${removeExpr removeReferences} '{}' + || true find $out/{bin,libexec,lib} -type f 2>/dev/null | xargs -r ${removeExpr removeReferences} || true
''; '';
strictDeps = true; strictDeps = true;

3
pkgs/development/go-packages/generic/default.nix
View File

@ -211,8 +211,7 @@ let
''; '';
preFixup = preFixup + '' preFixup = preFixup + ''
find $out/bin -type f -exec ${removeExpr removeReferences} '{}' + || true find $out/{bin,libexec,lib} -type f 2>/dev/null | xargs -r ${removeExpr removeReferences} || true
find $out/libexec -type f -exec ${removeExpr removeReferences} '{}' + || true
''; '';
strictDeps = true; strictDeps = true;

4
pkgs/os-specific/linux/fscrypt/default.nix
View File

@ -34,10 +34,6 @@ buildGoModule rec {
make install make install
''; '';
preFixup = ''
remove-references-to -t ${fscrypt-experimental.go} $out/lib/security/pam_fscrypt.so
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = description =
"A high-level tool for the management of Linux filesystem encryption"; "A high-level tool for the management of Linux filesystem encryption";