diff options
| author | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
|---|---|---|
| committer | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
| commit | 80d90d9b204f7c17912740f9f414fe5d59f293ba (patch) | |
| tree | 5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/pkgs/development/libraries/x265/default.nix | |
| parent | 3a31a84c7d3e589035ad08499206aac44a81f424 (diff) | |
| parent | 83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff) | |
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/libraries/x265/default.nix')
| -rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/libraries/x265/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/x265/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/x265/default.nix index ad43ac96d7df..3ad200cfc637 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/x265/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/x265/default.nix @@ -30,7 +30,7 @@ let src = fetchFromBitbucket { owner = "multicoreware"; repo = "x265_git"; - rev = "${version}"; + rev = version; sha256 = "1jzgv2hxhcwmsdf6sbgyzm88a46dp09ll1fqj92g9vckvh9a7dsn"; }; @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { "-DENABLE_SHARED=ON" "-DHIGH_BIT_DEPTH=OFF" "-DENABLE_HDR10_PLUS=OFF" - ] ++ stdenv.lib.optionals is64bit [ + ] ++ stdenv.lib.optionals (is64bit && !(stdenv.isAarch64 && stdenv.isLinux)) [ "-DEXTRA_LIB=${libx265-10}/lib/libx265.a;${libx265-12}/lib/libx265.a" "-DLINKED_10BIT=ON" "-DLINKED_12BIT=ON" |