Skip to content

Commit 76fe013

Browse files
authored
treewide: use dpkg setup hook (#359417)
2 parents 12dbe9f + e51a9df commit 76fe013

File tree

55 files changed

+31
-232
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+31
-232
lines changed

pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ stdenv.mkDerivation rec {
1515

1616
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook3 ];
1717

18-
unpackCmd = ''
19-
mkdir -p root
20-
dpkg-deb -x $curSrc root
21-
'';
22-
2318
dontBuild = true;
2419
dontWrapGApps = true; # we only want $gappsWrapperArgs here
2520

pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@ stdenv.mkDerivation rec {
3333

3434
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook3 ];
3535

36-
unpackCmd = ''
37-
mkdir -p root
38-
dpkg-deb -x $curSrc root
39-
'';
40-
4136
dontBuild = true;
4237
dontWrapGApps = true; # we only want $gappsWrapperArgs here
4338

pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,13 @@ stdenv.mkDerivation rec {
3232
version = "5.2.5";
3333

3434
src = fetchurl {
35+
name = "bitwig-studio-${version}.deb";
3536
url = "https://www.bitwig.com/dl/Bitwig%20Studio/${version}/installer_linux/";
3637
hash = "sha256-x6Uw6o+a3nArMm1Ev5ytGtLDGQ3r872WqlC022zT8Hk=";
3738
};
3839

3940
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook3 ];
4041

41-
unpackCmd = ''
42-
mkdir -p root
43-
dpkg-deb -x $curSrc root
44-
'';
45-
4642
dontBuild = true;
4743
dontWrapGApps = true; # we only want $gappsWrapperArgs here
4844

pkgs/applications/editors/standardnotes/default.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ stdenv.mkDerivation rec {
3333

3434
nativeBuildInputs = [ makeWrapper dpkg desktop-file-utils asar ];
3535

36-
unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner";
37-
3836
installPhase = let
3937
libPath = lib.makeLibraryPath [
4038
libsecret

pkgs/applications/graphics/odafileconverter/default.nix

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,10 @@ in mkDerivation {
1818
sha256 = "10027a3ab18efd04ca75aa699ff550eca3bdfe6f7084460d3c00001bffb50070";
1919
};
2020

21-
unpackPhase = ''
22-
dpkg -x $src oda_unpacked
23-
sourceRoot=$PWD/oda_unpacked
24-
'';
25-
2621
installPhase = ''
2722
mkdir -p $out/bin $out/lib
28-
cp -vr $sourceRoot/usr/bin/ODAFileConverter_${version} $out/libexec
29-
cp -vr $sourceRoot/usr/share $out/share
23+
cp -vr usr/bin/ODAFileConverter_${version} $out/libexec
24+
cp -vr usr/share $out/share
3025
'';
3126

3227
dontWrapQtApps = true;

pkgs/applications/misc/parsec/bin.nix

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,6 @@ stdenvNoCC.mkDerivation {
3333
sha256 = "sha256-9F56u+jYj2CClhbnGlLi65FxS1Vq00coxwu7mjVTY1w=";
3434
};
3535

36-
unpackPhase = ''
37-
runHook preUnpack
38-
39-
dpkg-deb -x $src .
40-
41-
runHook postUnpack
42-
'';
43-
4436
nativeBuildInputs = [ dpkg autoPatchelfHook makeWrapper ];
4537

4638
buildInputs = [

pkgs/applications/misc/pdfstudio/common.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ let
4646
})
4747
];
4848

49-
unpackCmd = "dpkg-deb -x $src ./${program}-${version}";
5049
dontBuild = true;
5150

5251
postPatch = ''

pkgs/applications/misc/rescuetime/default.nix

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@ in mkDerivation rec {
2020
nativeBuildInputs = [ dpkg ];
2121
# avoid https://github.com/NixOS/patchelf/issues/99
2222
dontStrip = true;
23-
unpackPhase = ''
24-
mkdir pkg
25-
dpkg-deb -x $src pkg
26-
sourceRoot=pkg
27-
'';
23+
2824
installPhase = ''
2925
mkdir -p $out/bin
3026
cp usr/bin/rescuetime $out/bin

pkgs/applications/networking/breitbandmessung/default.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ let
2424
makeWrapper
2525
];
2626

27-
unpackPhase = "dpkg-deb -x $src .";
28-
2927
installPhase = ''
3028
mkdir -p $out/bin
3129
mv usr/share $out/share

pkgs/applications/networking/instant-messengers/franz/generic.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@ in stdenv.mkDerivation (rec {
7171
];
7272
runtimeDependencies = [ libglvnd (lib.getLib stdenv.cc.cc) (lib.getLib udev) libnotify libappindicator-gtk3 ];
7373

74-
unpackPhase = "dpkg-deb -x $src .";
75-
7674
installPhase = ''
7775
mkdir -p $out/bin
7876
cp -r opt $out

0 commit comments

Comments
 (0)