Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a9d3d63eaae7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 502c16e591fb
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 12, 2020

  1. ultrastardx: 2017.8.0 -> 2019-01-07 

    follow up of the fix provided in UltraStar-Deluxe/USDX#462
to use pkg-config to find lua.
    @teto
    teto committed Jan 12, 2020
    Copy the full SHA
    502c16e View commit details
Showing with 3 additions and 5 deletions.
  1. +3 −5 pkgs/games/ultrastardx/default.nix
8 changes: 3 additions & 5 deletions pkgs/games/ultrastardx/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,21 +12,19 @@ let

in stdenv.mkDerivation rec {
pname = "ultrastardx";
version = "2017.8.0";
version = "unstable-2019-01-07";
src = fetchFromGitHub {
owner = "UltraStar-Deluxe";
repo = "USDX";
rev = "v${version}";
sha256 = "1zp0xfwzci3cjmwx3cprcxvm60cik5cvhvrz9n4d6yb8dv38nqzm";
rev = "3df142590f29db1505cc58746af9f8cf7cb4a6a5";
sha256 = "EpwGKK9B8seF7gRwo3kCeSzFQQW1p8rP4HXeu8/LoyA=";
};

nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [ fpc libpng ] ++ sharedLibs;

# https://github.com/UltraStar-Deluxe/USDX/issues/462
postPatch = ''
substituteInPlace src/config.inc.in \
--subst-var-by lua_LIB_NAME liblua.so \
--subst-var-by libpcre_LIBNAME libpcre.so.1
'';