public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #47995 from erictapen/47709-fallout

Browse Source 
fix broken packages from #47709
This commit is contained in:
Gabriel Ebner 2018-10-10 19:50:50 +02:00 committed by GitHub
commit c555a076e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/games/ja2-stracciatella/default.nix
View File

@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
./remove-rust-buildstep.patch ./remove-rust-buildstep.patch
]; ];
preConfigure = '' preConfigure = ''
sed -i -e 's|rust-stracciatella|${libstracciatella}/bin/libstracciatella.so|g' CMakeLists.txt sed -i -e 's|rust-stracciatella|${libstracciatella}/lib/libstracciatella.so|g' CMakeLists.txt
cmakeFlagsArray+=("-DEXTRA_DATA_DIR=$out/share/ja2") cmakeFlagsArray+=("-DEXTRA_DATA_DIR=$out/share/ja2")
''; '';

2
pkgs/tools/misc/vdirsyncer/default.nix
View File

@ -41,7 +41,7 @@ in pythonPackages.buildPythonApplication rec {
preBuild = '' preBuild = ''
mkdir -p rust/target/release mkdir -p rust/target/release
ln -s ${native}/bin/libvdirsyncer_rustext* rust/target/release/ ln -s ${native}/lib/libvdirsyncer_rustext* rust/target/release/
''; '';
LC_ALL = "en_US.utf8"; LC_ALL = "en_US.utf8";