diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 12:31:03 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 13:14:12 -0400 |
| commit | 219b74d71bdd8c93d099cc921cc4f192bd8753ad (patch) | |
| tree | b2566ed4e7f93429532dcea6d5e194b2cdc33022 /pkgs/development/libraries/SDL2 | |
| parent | 515ca1a7c8ca1c57b472826ae2b5dd2965b8b4bf (diff) | |
| download | nixpkgs-219b74d71bdd8c93d099cc921cc4f192bd8753ad.tar nixpkgs-219b74d71bdd8c93d099cc921cc4f192bd8753ad.tar.gz nixpkgs-219b74d71bdd8c93d099cc921cc4f192bd8753ad.tar.bz2 nixpkgs-219b74d71bdd8c93d099cc921cc4f192bd8753ad.tar.lz nixpkgs-219b74d71bdd8c93d099cc921cc4f192bd8753ad.tar.xz nixpkgs-219b74d71bdd8c93d099cc921cc4f192bd8753ad.tar.zst nixpkgs-219b74d71bdd8c93d099cc921cc4f192bd8753ad.zip | |
SDL, SDL2: Remove crossAttrs
Cross drvs are now the default for precisely this reason.
Diffstat (limited to 'pkgs/development/libraries/SDL2')
| -rw-r--r-- | pkgs/development/libraries/SDL2/default.nix | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index fe19ecadd0e..d852b594f6d 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -19,15 +19,6 @@ with lib; assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport; assert openglSupport -> (stdenv.isDarwin || x11Support && libGL != null); -let - - configureFlagsFun = attrs: [ - "--disable-oss" - ] ++ optional (!x11Support) "--without-x" - ++ optional alsaSupport "--with-alsa-prefix=${attrs.alsaLib.out}/lib"; - -in - stdenv.mkDerivation rec { name = "SDL2-${version}"; version = "2.0.8"; @@ -61,11 +52,10 @@ stdenv.mkDerivation rec { # pointer-constraints-unstable-v1-client-protocol.h: No such file or directory enableParallelBuilding = false; - configureFlags = configureFlagsFun { inherit alsaLib; }; - - crossAttrs = { - configureFlags = configureFlagsFun { alsaLib = alsaLib.crossDrv; }; - }; + configureFlags = [ + "--disable-oss" + ] ++ optional (!x11Support) "--without-x" + ++ optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib"; postInstall = '' moveToOutput lib/libSDL2main.a "$dev" |