Skip to content

Commit 50b4f0c

Browse files
authored
odafileconverter: 21.11.0.0 -> 25.11.0.0 (#366159)
2 parents f2c2962 + 0f62cb0 commit 50b4f0c

File tree

2 files changed

+24
-16
lines changed

2 files changed

+24
-16
lines changed

pkgs/applications/graphics/odafileconverter/default.nix renamed to pkgs/by-name/od/odafileconverter/package.nix

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,43 @@
11
{
22
lib,
33
stdenv,
4-
mkDerivation,
54
dpkg,
65
fetchurl,
7-
qtbase,
6+
qt6,
7+
libGL,
88
}:
99

1010
let
11-
# To obtain the version you will need to run the following command:
12-
#
13-
# dpkg-deb -I ${odafileconverter.src} | grep Version
14-
version = "21.11.0.0";
1511
rpath = "$ORIGIN:${
1612
lib.makeLibraryPath [
1713
stdenv.cc.cc
18-
qtbase
14+
qt6.qtbase
15+
libGL
1916
]
2017
}";
2118

2219
in
23-
mkDerivation {
20+
stdenv.mkDerivation rec {
2421
pname = "oda-file-converter";
25-
inherit version;
26-
nativeBuildInputs = [ dpkg ];
22+
# To obtain the version you will need to run the following command:
23+
#
24+
# dpkg-deb -I ${odafileconverter.src} | grep Version
25+
version = "25.11.0.0";
2726

2827
src = fetchurl {
2928
# NB: this URL is not stable (i.e. the underlying file and the corresponding version will change over time)
30-
url = "https://web.archive.org/web/20201206221727if_/https://download.opendesign.com/guestfiles/Demo/ODAFileConverter_QT5_lnxX64_7.2dll_21.11.deb";
31-
sha256 = "10027a3ab18efd04ca75aa699ff550eca3bdfe6f7084460d3c00001bffb50070";
29+
url = "https://web.archive.org/web/20241212154957/https://www.opendesign.com/guestfiles/get?filename=ODAFileConverter_QT6_lnxX64_8.3dll_25.11.deb";
30+
hash = "sha256-lykCOT9gmXZ3vGmak8mvrIMBEmGMJ/plmE3vkk9EjYo=";
3231
};
3332

33+
buildInputs = [
34+
qt6.qtbase
35+
];
36+
nativeBuildInputs = [
37+
dpkg
38+
qt6.wrapQtAppsHook
39+
];
40+
3441
installPhase = ''
3542
mkdir -p $out/bin $out/lib
3643
cp -vr usr/bin/ODAFileConverter_${version} $out/libexec
@@ -45,7 +52,7 @@ mkDerivation {
4552
wrapQtApp $out/libexec/ODAFileConverter
4653
mv $out/libexec/ODAFileConverter $out/bin
4754
48-
find $out/libexec -type f -executable | while read file; do
55+
find $out/libexec -not -path "*/doc/*" -not -path "*/translations/*" -type f -executable | while read file; do
4956
echo "patching $file"
5057
patchelf --set-rpath '${rpath}' $file
5158
done
@@ -56,7 +63,10 @@ mkDerivation {
5663
homepage = "https://www.opendesign.com/guestfiles/oda_file_converter";
5764
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
5865
license = licenses.unfree;
59-
maintainers = with maintainers; [ nagisa ];
66+
maintainers = with maintainers; [
67+
nagisa
68+
konradmalik
69+
];
6070
platforms = [ "x86_64-linux" ];
6171
mainProgram = "ODAFileConverter";
6272
};

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2602,8 +2602,6 @@ with pkgs;
26022602
inherit (darwin.apple_sdk.frameworks) AppKit Security;
26032603
};
26042604

2605-
odafileconverter = libsForQt5.callPackage ../applications/graphics/odafileconverter { };
2606-
26072605
pastel = callPackage ../applications/misc/pastel {
26082606
inherit (darwin.apple_sdk.frameworks) Security;
26092607
};

0 commit comments

Comments
 (0)