steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

feat(common,steveej-t14,graphical): udpate to nixos-22.05

Browse source
This commit is contained in:
steveej 2022-06-02 11:34:21 +02:00
parent aec8ff4e9a
commit 4a2ee46f7f
13 changed files with 42 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nix/pkgs/browserpass/default.nix
View file

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
libPath = lib.makeLibraryPath [ ];
installPhase = ''
set -x
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 browserpass-linux64
patchelf --set-interpreter ${glibc}/lib/ld-linux-x86-64.so.2 browserpass-linux64
mkdir -p $out/bin
cp -a * $out/bin/

29
nix/pkgs/nomad/default.nix
View file

@ -1,29 +0,0 @@
with import <nixpkgs> {};
stdenv.mkDerivation rec {
name = "nomad";
version = "0.1.2";
filename = "nomad_${version}_linux_amd64.zip";
src = fetchurl {
url = "https://releases.hashicorp.com/nomad/${version}/${filename}";
sha256 = "0d3r3n1wwlic1kg3hgghds7f3b0qhh97v8xf36mcmsnmn2ngfd9k";
};
unpackPhase = ''
unzip ${src}
'';
buildInputs = [ makeWrapper unzip ];
libPath = lib.makeLibraryPath [ ];
installPhase = ''
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 ./nomad
mkdir -p $out/bin
cp ./nomad $out/bin/nomad
# wrapProgram $out/bin/nomad \
# --prefix LD_LIBRARY_PATH : "${libPath}"
#
'';
}