diff options
author | Artturi <Artturin@artturin.com> | 2022-11-20 15:07:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-20 15:07:28 +0200 |
commit | 8181233059a8caf6f7bde1172c042a42883ecb56 (patch) | |
tree | 7de5f08cd4494cbeeb7b529e34022f4493450b9b /pkgs/development | |
parent | 6638106edfd3e7a1232c356c9ae4d672e5344753 (diff) | |
parent | 341e6fd558abde5b4f6609833ff503c8d1e9b379 (diff) |
Merge pull request #201946 from Artturin/splicingstuff2
lib.overrideDerivation: override attrs in __spliced && splice.nix: start deprecating nativeDrv and crossDrv
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/qt-6/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/qt-6/qtModule.nix | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 5d17df8028d2e..4c36e29f02f2c 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -107,6 +107,8 @@ let } ./hooks/qmake-hook.sh; }; + # TODO(@Artturin): convert to makeScopeWithSplicing + # simple example of how to do that in 5568a4d25ca406809530420996d57e0876ca1a01 self = lib.makeScope newScope addPackages; in self diff --git a/pkgs/development/libraries/qt-6/qtModule.nix b/pkgs/development/libraries/qt-6/qtModule.nix index 3ef0ea191a760..5f6d429edf58b 100644 --- a/pkgs/development/libraries/qt-6/qtModule.nix +++ b/pkgs/development/libraries/qt-6/qtModule.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation (args // { if [[ -z "$dontSyncQt" && -f sync.profile ]]; then # FIXME: this probably breaks crosscompiling as it's not from nativeBuildInputs # I don't know how to get /libexec from nativeBuildInputs to work, it's not under /bin - ${self.qtbase.dev.nativeDrv or self.qtbase.dev}/libexec/syncqt.pl -version "''${version%%-*}" + ${lib.getDev self.qtbase}/libexec/syncqt.pl -version "''${version%%-*}" fi ''; |