diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-01-13 17:46:44 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-01-13 17:46:44 +0100 |
| commit | 7637e71cee2b11d340c5ce99d777f6783a6b9885 (patch) | |
| tree | 14c7105faaef7c573105998f1bcb08afd403a5c0 /pkgs/games | |
| parent | 995c9db5e6af69f44d87b8a28537f78dfd3f1582 (diff) | |
| parent | 3dfd87d7afc2d82f6b0ce7b8d7a61ffaa47526a0 (diff) | |
| download | nixlib-7637e71cee2b11d340c5ce99d777f6783a6b9885.tar nixlib-7637e71cee2b11d340c5ce99d777f6783a6b9885.tar.gz nixlib-7637e71cee2b11d340c5ce99d777f6783a6b9885.tar.bz2 nixlib-7637e71cee2b11d340c5ce99d777f6783a6b9885.tar.lz nixlib-7637e71cee2b11d340c5ce99d777f6783a6b9885.tar.xz nixlib-7637e71cee2b11d340c5ce99d777f6783a6b9885.tar.zst nixlib-7637e71cee2b11d340c5ce99d777f6783a6b9885.zip | |
merge #5521: give fetchgit outputs nicer names
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/dwarf-fortress/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index c4a10155523f..f4f35f6ad8c9 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = "${srcs.df_unfuck} ${srcs.df}"; phases = "unpackPhase patchPhase configurePhase buildPhase installPhase"; - sourceRoot = "git-export"; + sourceRoot = srcs.df_unfuck.name; cmakeFlags = [ "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include" @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { echo $(md5sum $out/share/df_linux/libs/Dwarf_Fortress | cut -c1-8) > $out/share/df_linux/hash.md5.orig # Fix rpath patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.gcc stdenv.glibc ]}:$out/share/df_linux/libs" $out/share/df_linux/libs/Dwarf_Fortress - cp -f ./git-export/build/libgraphics.so $out/share/df_linux/libs/libgraphics.so + cp -f ./${srcs.df_unfuck.name}/build/libgraphics.so $out/share/df_linux/libs/libgraphics.so cp $permission $out/share/df_linux/nix_permission |