diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2017-10-10 17:22:48 +0200 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2017-10-10 17:23:10 +0200 |
| commit | ef291b52f3c4efa4da8b7c12c6d96e4ae0bcef41 (patch) | |
| tree | 733e084d2625b0d554b16dddcec0a96e44299448 | |
| parent | e71a6aabf8b4ef0e6575f225ac7e1a1013a328c7 (diff) | |
| download | nixpkgs-ef291b52f3c4efa4da8b7c12c6d96e4ae0bcef41.tar nixpkgs-ef291b52f3c4efa4da8b7c12c6d96e4ae0bcef41.tar.gz nixpkgs-ef291b52f3c4efa4da8b7c12c6d96e4ae0bcef41.tar.bz2 nixpkgs-ef291b52f3c4efa4da8b7c12c6d96e4ae0bcef41.tar.lz nixpkgs-ef291b52f3c4efa4da8b7c12c6d96e4ae0bcef41.tar.xz nixpkgs-ef291b52f3c4efa4da8b7c12c6d96e4ae0bcef41.tar.zst nixpkgs-ef291b52f3c4efa4da8b7c12c6d96e4ae0bcef41.zip | |
pingus, quirc: fix pkgconfig passing
| -rw-r--r-- | pkgs/games/pingus/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/graphics/quirc/default.nix | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/games/pingus/default.nix b/pkgs/games/pingus/default.nix index 8b8a6fed841..9704cb93e6b 100644 --- a/pkgs/games/pingus/default.nix +++ b/pkgs/games/pingus/default.nix @@ -1,8 +1,6 @@ {stdenv, fetchurl, scons, SDL, SDL_image, boost, libpng, SDL_mixer, pkgconfig , mesa}: let - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [scons SDL SDL_image boost libpng SDL_mixer mesa]; s = # Generated upstream information rec { baseName="pingus"; @@ -15,7 +13,8 @@ let in stdenv.mkDerivation rec { inherit (s) name version; - inherit buildInputs; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [scons SDL SDL_image boost libpng SDL_mixer mesa]; src = fetchurl { inherit (s) url sha256; }; diff --git a/pkgs/tools/graphics/quirc/default.nix b/pkgs/tools/graphics/quirc/default.nix index caff97f0e32..9891ea5e52b 100644 --- a/pkgs/tools/graphics/quirc/default.nix +++ b/pkgs/tools/graphics/quirc/default.nix @@ -10,14 +10,13 @@ let rev = "5b262480091d5f84a67a4a56c728fc8b39844339"; sha256 = "1w5qvjafn14s6jjs7kiwsqirlsqbgv0p152hrsq463pm34hp0lzy"; }; +in +stdenv.mkDerivation { + inherit (s) name version; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ SDL SDL_gfx libjpeg libpng ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; src = fetchgit { inherit (s) url sha256 rev; }; |