diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-10-24 14:47:43 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-10-24 14:47:43 +0200 |
| commit | 5621b77a33b311e82c8870f6872a2beffef9dbd0 (patch) | |
| tree | 1d561826278871fa8c065ff84cdadc0922cb758b /pkgs/development/libraries/libx86/default.nix | |
| parent | 658335d6a88b623ab926dea99425e2716afa7f4e (diff) | |
| parent | 322fa6b06cfbe66ef1bc12b1bfd5fd37d63cbf87 (diff) | |
| download | nixpkgs-5621b77a33b311e82c8870f6872a2beffef9dbd0.tar nixpkgs-5621b77a33b311e82c8870f6872a2beffef9dbd0.tar.gz nixpkgs-5621b77a33b311e82c8870f6872a2beffef9dbd0.tar.bz2 nixpkgs-5621b77a33b311e82c8870f6872a2beffef9dbd0.tar.lz nixpkgs-5621b77a33b311e82c8870f6872a2beffef9dbd0.tar.xz nixpkgs-5621b77a33b311e82c8870f6872a2beffef9dbd0.tar.zst nixpkgs-5621b77a33b311e82c8870f6872a2beffef9dbd0.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/libraries/libx86/default.nix')
| -rw-r--r-- | pkgs/development/libraries/libx86/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libx86/default.nix b/pkgs/development/libraries/libx86/default.nix index 162d284f402..d73d67a39cf 100644 --- a/pkgs/development/libraries/libx86/default.nix +++ b/pkgs/development/libraries/libx86/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { # http://www.mail-archive.com/suspend-devel@lists.sourceforge.net/msg02355.html makeFlags = [ "DESTDIR=$(out)" - ] ++ stdenv.lib.optional (stdenv.isx86_64 || stdenv.isArm) "BACKEND=x86emu"; + ] ++ stdenv.lib.optional (!stdenv.isi686) "BACKEND=x86emu"; preBuild = '' sed -i lrmi.c -e 's@defined(__i386__)@(defined(__i386__) || defined(__x86_64__))@' @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Real-mode x86 code emulator"; maintainers = with maintainers; [ raskin ]; - platforms = with platforms; linux ++ freebsd ++ netbsd; + platforms = [ "x86_64-linux" "i686-linux" ]; license = licenses.mit; }; } |