diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-01-13 17:44:24 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-01-13 17:46:09 +0100 |
| commit | 3dfd87d7afc2d82f6b0ce7b8d7a61ffaa47526a0 (patch) | |
| tree | 80b9f074d728e1cd3f06d9777d9e87967a7e6ade /pkgs/games/dwarf-fortress | |
| parent | 664d0fbbba2e94bf63372751a029b05dd190ba7b (diff) | |
| download | nixlib-3dfd87d7afc2d82f6b0ce7b8d7a61ffaa47526a0.tar nixlib-3dfd87d7afc2d82f6b0ce7b8d7a61ffaa47526a0.tar.gz nixlib-3dfd87d7afc2d82f6b0ce7b8d7a61ffaa47526a0.tar.bz2 nixlib-3dfd87d7afc2d82f6b0ce7b8d7a61ffaa47526a0.tar.lz nixlib-3dfd87d7afc2d82f6b0ce7b8d7a61ffaa47526a0.tar.xz nixlib-3dfd87d7afc2d82f6b0ce7b8d7a61ffaa47526a0.tar.zst nixlib-3dfd87d7afc2d82f6b0ce7b8d7a61ffaa47526a0.zip | |
fixup "git-export" directory names
All tested to build. For freetalk the hash change seems unrelated to fetchgit changes. FIXME: it might be suitable to adapt nix-prefetch-git.
Diffstat (limited to 'pkgs/games/dwarf-fortress')
| -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 |