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: 90691042af87
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 394315def1de
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 8, 2021

  1. x264: fix static build

    @orivej
    orivej committed Apr 8, 2021
    2
    Copy the full SHA
    394315d View commit details
Showing with 4 additions and 2 deletions.
  1. +4 −2 pkgs/development/libraries/x264/default.nix
6 changes: 4 additions & 2 deletions pkgs/development/libraries/x264/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{ stdenv, lib, fetchurl, nasm }:
{ stdenv, lib, fetchurl, nasm
, enableShared ? !stdenv.hostPlatform.isStatic
}:

stdenv.mkDerivation rec {
pname = "x264";
@@ -28,7 +30,7 @@ stdenv.mkDerivation rec {
export AS=$CC
'';

configureFlags = [ "--enable-shared" ]
configureFlags = lib.optional enableShared [ "--enable-shared" ]
++ lib.optional (!stdenv.isi686) "--enable-pic"
++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--cross-prefix=${stdenv.cc.targetPrefix}";