diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2019-08-27 05:28:29 +0000 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2019-08-27 05:57:23 +0000 |
| commit | e063d084de472cf0f7ab19d6785242970102a653 (patch) | |
| tree | 46f6f72f341d5be50a8a2d1e4294950670df1d68 | |
| parent | 7a4a8e008988b64059e7b8f1ee5e30c0102a36e4 (diff) | |
| download | nixpkgs-e063d084de472cf0f7ab19d6785242970102a653.tar nixpkgs-e063d084de472cf0f7ab19d6785242970102a653.tar.gz nixpkgs-e063d084de472cf0f7ab19d6785242970102a653.tar.bz2 nixpkgs-e063d084de472cf0f7ab19d6785242970102a653.tar.lz nixpkgs-e063d084de472cf0f7ab19d6785242970102a653.tar.xz nixpkgs-e063d084de472cf0f7ab19d6785242970102a653.tar.zst nixpkgs-e063d084de472cf0f7ab19d6785242970102a653.zip | |
qarte: use qt5’s mkDerivation
See #65399
| -rw-r--r-- | pkgs/applications/video/qarte/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 15 insertions, 10 deletions
diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix index f0c3776a433..bd70c84175c 100644 --- a/pkgs/applications/video/qarte/default.nix +++ b/pkgs/applications/video/qarte/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchbzr, python3, rtmpdump, makeWrapper }: +{ mkDerivation, lib, fetchbzr, python3, rtmpdump }: let - pythonEnv = python3.withPackages (ps: with ps; [ pyqt5 sip ]); -in stdenv.mkDerivation { + pythonEnv = python3.withPackages (ps: with ps; [ pyqt5 ]); +in mkDerivation { name = "qarte-4.6.0"; src = fetchbzr { url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/qarte-4; @@ -10,28 +10,33 @@ in stdenv.mkDerivation { sha256 = "0v4zpj8w67ydvnmanxbl8pwvn0cfv70c0mlw36a1r4n0rvgxffcn"; }; - buildInputs = [ makeWrapper pythonEnv ]; + buildInputs = [ pythonEnv ]; installPhase = '' + runHook preInstall mkdir -p $out/bin mv qarte $out/bin/ substituteInPlace $out/bin/qarte \ --replace '/usr/share' "$out/share" - wrapProgram $out/bin/qarte \ - --prefix PATH : "${rtmpdump}/bin" mkdir -p $out/share/man/man1/ mv qarte.1 $out/share/man/man1/ mkdir -p $out/share/qarte mv * $out/share/qarte/ + runHook postInstall + ''; + + postFixup = '' + wrapQtApp $out/bin/qarte \ + --prefix PATH : ${rtmpdump}/bin ''; meta = { homepage = https://launchpad.net/qarte; description = "A recorder for Arte TV Guide and Arte Concert"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ vbgl ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbe2e49bc8f..64b03b42315 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5689,7 +5689,7 @@ in openmodelica = callPackage ../applications/science/misc/openmodelica { }; - qarte = callPackage ../applications/video/qarte { }; + qarte = libsForQt5.callPackage ../applications/video/qarte { }; qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { }; |