remove usage of patchelfUnstable now that it's released

This commit is contained in:
Domen Kožar 2020-07-08 21:55:09 +02:00
parent bddf762cf5
commit 347ab190c7
No known key found for this signature in database
GPG Key ID: C2FFBCAFD2C24246
7 changed files with 6 additions and 17 deletions

View File

@ -3,7 +3,7 @@
, glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit
, libva ? null
, pipewire_0_2
, gcc, nspr, nss, patchelfUnstable, runCommand
, gcc, nspr, nss, runCommand
, lib
# package customization
@ -69,8 +69,6 @@ let
# The .deb file for Google Chrome
src = upstream-info.binary;
nativeBuildInputs = [ patchelfUnstable ];
phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ];
unpackCmd = let

View File

@ -4,7 +4,6 @@
, nspr
, nss
, fetchzip
, patchelfUnstable
, enablePepperFlash ? false
, upstream-info

View File

@ -2,7 +2,7 @@
, makeWrapper, ed
, glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit
, libva ? null
, gcc, nspr, nss, patchelfUnstable, runCommand
, gcc, nspr, nss, runCommand
, lib
# package customization
@ -67,8 +67,6 @@ let
# The .deb file for Google Chrome
src = upstream-info.binary;
nativeBuildInputs = [ patchelfUnstable ];
phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ];
unpackCmd = let

View File

@ -4,7 +4,6 @@
, nspr
, nss
, fetchzip
, patchelfUnstable
, enablePepperFlash ? false
, upstream-info

View File

@ -1,8 +1,6 @@
{ stdenv
, fetchurl
, rpmextract
, patchelf
, patchelfUnstable
, libnotify
, libuuid
, cairo
@ -96,11 +94,11 @@ stdenv.mkDerivation rec {
mv usr/share share
rmdir usr
${patchelf}/bin/patchelf \
patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
--replace-needed libudev.so.0 libudev.so.1 \
opt/BlueJeans/bluejeans-v2
${patchelfUnstable}/bin/patchelf \
patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
opt/BlueJeans/resources/BluejeansHelper

View File

@ -14,7 +14,6 @@
, enableHardening ? false
, headless ? false
, enable32bitGuests ? true
, patchelfUnstable # needed until 0.10 is released
}:
with stdenv.lib;
@ -46,7 +45,7 @@ in stdenv.mkDerivation {
outputs = [ "out" "modsrc" ];
nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 patchelfUnstable ]
nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 ]
++ optional (!headless) wrapQtAppsHook;
# Wrap manually because we wrap just a small number of executables.

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, patchelfUnstable }:
{ stdenv, fetchurl }:
with stdenv.lib;
@ -24,8 +24,6 @@ stdenv.mkDerivation {
sourceRoot = ".";
nativeBuildInputs = optionals stdenv.isLinux [ patchelfUnstable ];
unpackPhase = "cp $src ngrok";
buildPhase = "chmod a+x ngrok";