diff options
| author | Mitsuhiro Nakamura <m.nacamura@gmail.com> | 2018-01-21 06:57:44 +0900 |
|---|---|---|
| committer | Mitsuhiro Nakamura <m.nacamura@gmail.com> | 2018-01-21 06:57:44 +0900 |
| commit | bd57ec3870aedd8ab3df131bb1518c40ebc6c77a (patch) | |
| tree | 5f1bc2b199b6831263e190a2c7a786e73351bfc6 /pkgs | |
| parent | 4014b24ca167a087384b0ccbed88df4538dcc577 (diff) | |
| download | nixpkgs-bd57ec3870aedd8ab3df131bb1518c40ebc6c77a.tar nixpkgs-bd57ec3870aedd8ab3df131bb1518c40ebc6c77a.tar.gz nixpkgs-bd57ec3870aedd8ab3df131bb1518c40ebc6c77a.tar.bz2 nixpkgs-bd57ec3870aedd8ab3df131bb1518c40ebc6c77a.tar.lz nixpkgs-bd57ec3870aedd8ab3df131bb1518c40ebc6c77a.tar.xz nixpkgs-bd57ec3870aedd8ab3df131bb1518c40ebc6c77a.tar.zst nixpkgs-bd57ec3870aedd8ab3df131bb1518c40ebc6c77a.zip | |
SDL2_{gfx,mixer,net,ttf}: move libobjc to buildInputs
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/SDL2_gfx/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/SDL2_net/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/SDL2_ttf/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/smpeg2/default.nix | 6 |
4 files changed, 8 insertions, 10 deletions
diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix index d3c868cb3bd..a630e9cead8 100644 --- a/pkgs/development/libraries/SDL2_gfx/default.nix +++ b/pkgs/development/libraries/SDL2_gfx/default.nix @@ -9,9 +9,8 @@ stdenv.mkDerivation rec { sha256 = "16jrijzdp095qf416zvj9gs2fqqn6zkyvlxs5xqybd0ip37cp6yn"; }; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.libobjc; - - buildInputs = [ SDL2 ]; + buildInputs = [ SDL2 ] + ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc; configureFlags = if stdenv.isi686 || stdenv.isx86_64 then "--enable-mmx" else "--disable-mmx"; diff --git a/pkgs/development/libraries/SDL2_net/default.nix b/pkgs/development/libraries/SDL2_net/default.nix index ad6232406b0..780444d51f4 100644 --- a/pkgs/development/libraries/SDL2_net/default.nix +++ b/pkgs/development/libraries/SDL2_net/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm"; }; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.libobjc; + buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.libobjc; propagatedBuildInputs = [ SDL2 ]; diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix index d691d6dfa1d..87436119ef4 100644 --- a/pkgs/development/libraries/SDL2_ttf/default.nix +++ b/pkgs/development/libraries/SDL2_ttf/default.nix @@ -9,9 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0xljwcpvd2knrjdfag5b257xqayplz55mqlszrqp0kpnphh5xnrl"; }; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.libobjc; - - buildInputs = [ SDL2 freetype mesa_noglu ]; + buildInputs = [ SDL2 freetype mesa_noglu ] + ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc; meta = with stdenv.lib; { description = "SDL TrueType library"; diff --git a/pkgs/development/libraries/smpeg2/default.nix b/pkgs/development/libraries/smpeg2/default.nix index 83660e042fc..3207bdb3a7f 100644 --- a/pkgs/development/libraries/smpeg2/default.nix +++ b/pkgs/development/libraries/smpeg2/default.nix @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { ./sdl2.patch ]; - nativeBuildInputs = [ autoconf automake pkgconfig makeWrapper ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc; + nativeBuildInputs = [ autoconf automake pkgconfig makeWrapper ]; - buildInputs = [ SDL2 ]; + buildInputs = [ SDL2 ] + ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc; preConfigure = '' sh autogen.sh |