pyrox.dev / nixpkgs
lol
fork atom

Merge branch 'mboes-vagrant-ld-path-fix'

Mateusz Kowalczyk c6549af6 f45b8176

+4 -1
unified split
+4 -1
pkgs/development/tools/vagrant/default.nix
··· 1 { stdenv, fetchurl, dpkg, curl, libarchive, openssl, ruby, buildRubyGem, libiconv 2 - , libxml2, libxslt }: 3 4 assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; 5 ··· 34 maintainers = with maintainers; [ lovek323 globin jgeerds ]; 35 platforms = platforms.linux; 36 }; 37 38 unpackPhase = '' 39 ${dpkg}/bin/dpkg-deb -x ${src} . ··· 89 mkdir -p "$out" 90 cp -r opt "$out" 91 cp -r usr/bin "$out" 92 ''; 93 94 preFixup = ''
··· 1 { stdenv, fetchurl, dpkg, curl, libarchive, openssl, ruby, buildRubyGem, libiconv 2 + , libxml2, libxslt, makeWrapper }: 3 4 assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; 5 ··· 34 maintainers = with maintainers; [ lovek323 globin jgeerds ]; 35 platforms = platforms.linux; 36 }; 37 + 38 + buildInputs = [ makeWrapper ]; 39 40 unpackPhase = '' 41 ${dpkg}/bin/dpkg-deb -x ${src} . ··· 91 mkdir -p "$out" 92 cp -r opt "$out" 93 cp -r usr/bin "$out" 94 + wrapProgram $out/bin/vagrant --prefix LD_LIBRARY_PATH : $out/opt/vagrant/embedded/lib 95 ''; 96 97 preFixup = ''